Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
index 7f1da13659f54f62a80ab45a51ba1b03d0ec8e42..631edc673c5b312365665f163c0027f2c72a47c7 100644 |
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
@@ -299,7 +299,7 @@ void CompositedLayerMapping::updateIsRootForIsolatedGroup() |
void CompositedLayerMapping::updateBackgroundPaintsOntoScrollingContentsLayer() |
{ |
- bool shouldPaintOntoScrollingContentsLayer = shouldPaintBackgroundOntoScrollingContentsLayer(); |
+ bool shouldPaintOntoScrollingContentsLayer = m_owningLayer.shouldPaintBackgroundOntoScrollingContentsLayer(); |
if (shouldPaintOntoScrollingContentsLayer != backgroundPaintsOntoScrollingContentsLayer()) { |
m_backgroundPaintsOntoScrollingContentsLayer = shouldPaintOntoScrollingContentsLayer; |
// If the background is no longer painted onto the scrolling contents |
@@ -2584,14 +2584,6 @@ bool CompositedLayerMapping::invalidateLayerIfNoPrecedingEntry(size_t indexToCle |
return false; |
} |
-bool CompositedLayerMapping::shouldPaintBackgroundOntoScrollingContentsLayer() const |
-{ |
- return !m_owningLayer.isRootLayer() |
- && m_owningLayer.scrollsOverflow() |
- && m_owningLayer.layoutObject()->style()->hasEntirelyLocalBackground() |
- && !m_owningLayer.stackingNode()->hasNegativeZOrderList(); |
-} |
- |
bool CompositedLayerMapping::updateSquashingLayerAssignment(PaintLayer* squashedLayer, size_t nextSquashedLayerIndex) |
{ |
GraphicsLayerPaintInfo paintInfo; |