Index: third_party/WebKit/Source/core/paint/BoxPainter.cpp |
diff --git a/third_party/WebKit/Source/core/paint/BoxPainter.cpp b/third_party/WebKit/Source/core/paint/BoxPainter.cpp |
index 291369eb20b21d3718be9ec23b9316851ca118cb..16d36b63b09b93b808a7026e43209c238e15c2dc 100644 |
--- a/third_party/WebKit/Source/core/paint/BoxPainter.cpp |
+++ b/third_party/WebKit/Source/core/paint/BoxPainter.cpp |
@@ -157,9 +157,8 @@ bool BoxPainter::calculateFillLayerOcclusionCulling(FillLayerOcclusionOutputList |
// FIXME : It would be possible for the following occlusion culling test to be more aggressive |
// on layers with no repeat by testing whether the image covers the layout rect. |
// Testing that here would imply duplicating a lot of calculations that are currently done in |
- // LayoutBoxModelObject::paintFillLayerExtended. A more efficient solution might be to move |
- // the layer recursion into paintFillLayerExtended, or to compute the layer geometry here |
- // and pass it down. |
+ // LayoutBoxModelObject::paintFillLayer. A more efficient solution might be to move the layer |
+ // recursion into paintFillLayer, or to compute the layer geometry here and pass it down. |
// TODO(trchen): Need to check compositing mode as well. |
if (currentLayer->blendMode() != WebBlendModeNormal) |
@@ -205,18 +204,12 @@ void BoxPainter::paintFillLayers(const PaintInfo& paintInfo, const Color& c, con |
context.beginLayer(); |
for (auto it = reversedPaintList.rbegin(); it != reversedPaintList.rend(); ++it) |
- paintFillLayer(paintInfo, c, **it, rect, bleedAvoidance, op, backgroundObject); |
+ paintFillLayer(m_layoutBox, paintInfo, c, **it, rect, bleedAvoidance, 0, LayoutSize(), op, backgroundObject); |
if (shouldDrawBackgroundInSeparateBuffer) |
context.endLayer(); |
} |
-void BoxPainter::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const FillLayer& fillLayer, const LayoutRect& rect, |
- BackgroundBleedAvoidance bleedAvoidance, SkXfermode::Mode op, const LayoutObject* backgroundObject) |
-{ |
- BoxPainter::paintFillLayerExtended(m_layoutBox, paintInfo, c, fillLayer, rect, bleedAvoidance, 0, LayoutSize(), op, backgroundObject); |
-} |
- |
void BoxPainter::applyBoxShadowForBackground(GraphicsContext& context, const LayoutObject& obj) |
{ |
const ShadowList* shadowList = obj.style()->boxShadow(); |
@@ -286,7 +279,7 @@ FloatRoundedRect BoxPainter::backgroundRoundedRectAdjustedForBleedAvoidance(cons |
return getBackgroundRoundedRect(obj, borderRect, box, boxSize.width(), boxSize.height(), includeLogicalLeftEdge, includeLogicalRightEdge); |
} |
-void BoxPainter::paintFillLayerExtended(const LayoutBoxModelObject& obj, const PaintInfo& paintInfo, const Color& color, const FillLayer& bgLayer, const LayoutRect& rect, BackgroundBleedAvoidance bleedAvoidance, const InlineFlowBox* box, const LayoutSize& boxSize, SkXfermode::Mode op, const LayoutObject* backgroundObject) |
+void BoxPainter::paintFillLayer(const LayoutBoxModelObject& obj, const PaintInfo& paintInfo, const Color& color, const FillLayer& bgLayer, const LayoutRect& rect, BackgroundBleedAvoidance bleedAvoidance, const InlineFlowBox* box, const LayoutSize& boxSize, SkXfermode::Mode op, const LayoutObject* backgroundObject) |
{ |
GraphicsContext& context = paintInfo.context; |
if (rect.isEmpty()) |