Commit e5d750ba authored by Philip Rogers's avatar Philip Rogers Committed by Commit Bot

Remove deadcode from core/paint classes

Remove LineBoxListPainter::InvalidateLineBoxPaintOffsets
Deadcode from https://crrev.com/9200103f3f0c21d9bd88c669159a43097ba185ed

Remove InlineTextBoxPainter::PaintCompositionBackgrounds
Deadcode from https://crrev.com/81808f5a2947e0a2c6d895fe59438ac7e3af04c8

Remove BoxPainter::IsFillLayerOpaque
Deadcode from https://crrev.com/e3ab046fcbe969bd1b38a0361f7d583998365c2c

Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: Icfa5df530d09bbb13aed0946f6bb2c114027ada7
Reviewed-on: https://chromium-review.googlesource.com/530038Reviewed-by: default avatarXianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org>
Commit-Queue: Philip Rogers <pdr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#478711}
parent e454b81a
......@@ -39,10 +39,6 @@ class BoxPainter : public BoxPainterBase {
void PaintMask(const PaintInfo&, const LayoutPoint&);
void PaintClippingMask(const PaintInfo&, const LayoutPoint&);
// Returns true if the fill layer will certainly occlude anything painted
// behind it.
static bool IsFillLayerOpaque(const FillLayer&, const LayoutObject&);
void PaintFillLayers(const PaintInfo&,
const Color&,
const FillLayer&,
......
......@@ -62,11 +62,6 @@ class InlineTextBoxPainter {
private:
enum class PaintOptions { kNormal, kCombinedText };
void PaintCompositionBackgrounds(GraphicsContext&,
const LayoutPoint& box_origin,
const ComputedStyle&,
const Font&,
bool use_custom_underlines);
void PaintSingleCompositionBackgroundRun(GraphicsContext&,
const LayoutPoint& box_origin,
const ComputedStyle&,
......
......@@ -77,29 +77,4 @@ void LineBoxListPainter::Paint(const LayoutBoxModelObject& layout_object,
}
}
static void InvalidateLineBoxPaintOffsetsInternal(
PaintController& paint_controller,
InlineFlowBox* inline_box) {
#if 0
// TODO(wangxianzhu): Implement this with PaintInvalidator.
paintController.invalidatePaintOffset(*inlineBox);
for (InlineBox* child = inlineBox->firstChild(); child; child = child->nextOnLine()) {
if (!child->getLineLayoutItem().isText() && child->boxModelObject().hasSelfPaintingLayer())
continue;
if (child->isInlineFlowBox())
invalidateLineBoxPaintOffsetsInternal(paintController, toInlineFlowBox(child));
else
paintController.invalidatePaintOffset(*child);
}
#endif
}
void LineBoxListPainter::InvalidateLineBoxPaintOffsets(
const PaintInfo& paint_info) const {
PaintController& paint_controller = paint_info.context.GetPaintController();
for (InlineFlowBox* curr = line_box_list_.FirstLineBox(); curr;
curr = curr->NextLineBox())
InvalidateLineBoxPaintOffsetsInternal(paint_controller, curr);
}
} // namespace blink
......@@ -26,8 +26,6 @@ class LineBoxListPainter {
const PaintInfo&,
const LayoutPoint&) const;
void InvalidateLineBoxPaintOffsets(const PaintInfo&) const;
private:
const LineBoxList& line_box_list_;
};
......
......@@ -104,14 +104,6 @@ class PaintArtifactCompositor::ContentLayerClientImpl
CcLayersRasterInvalidationTrackingMap().Remove(cc_picture_layer_.get());
}
bool HasTrackedRasterInvalidations() const {
RasterInvalidationTracking* tracking =
CcLayersRasterInvalidationTrackingMap().Find(cc_picture_layer_.get());
if (tracking)
return !tracking->invalidations.IsEmpty();
return false;
}
RasterInvalidationTracking& EnsureRasterInvalidationTracking() {
return CcLayersRasterInvalidationTrackingMap().Add(cc_picture_layer_.get());
}
......@@ -184,14 +176,6 @@ void PaintArtifactCompositor::ResetTrackedRasterInvalidations() {
client->ResetTrackedRasterInvalidations();
}
bool PaintArtifactCompositor::HasTrackedRasterInvalidations() const {
for (auto& client : content_layer_clients_) {
if (client->HasTrackedRasterInvalidations())
return true;
}
return false;
}
std::unique_ptr<JSONObject> PaintArtifactCompositor::LayersAsJSON(
LayerTreeFlags flags) const {
std::unique_ptr<JSONArray> layers_json = JSONArray::Create();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment