Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp |
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
index 78fa4e42d04b74a3cc6b1ec1411fb3cd61f3cd24..b9140fca3393d95b231188888f6fe7944e704159 100644 |
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp |
@@ -2344,6 +2344,14 @@ GraphicsLayer* PaintLayer::graphicsLayerBackingForScrolling() const |
} |
} |
+bool PaintLayer::shouldPaintBackgroundOntoScrollingContentsLayer() const |
+{ |
+ return !isRootLayer() |
+ && scrollsOverflow() |
+ && layoutObject()->style()->hasEntirelyLocalBackground() |
+ && !stackingNode()->hasNegativeZOrderList(); |
+} |
+ |
void PaintLayer::ensureCompositedLayerMapping() |
{ |
if (m_rareData && m_rareData->compositedLayerMapping) |
@@ -2451,7 +2459,7 @@ bool PaintLayer::childBackgroundIsKnownToBeOpaqueInRect(const LayoutRect& localR |
PaintLayerStackingNodeReverseIterator reverseIterator(*m_stackingNode, PositiveZOrderChildren | NormalFlowChildren | NegativeZOrderChildren); |
while (PaintLayerStackingNode* child = reverseIterator.next()) { |
const PaintLayer* childLayer = child->layer(); |
- // Stop at composited paint boundaries. |
+ // Stop at composited paint boundaries and non-self-painting layers. |
if (childLayer->isPaintInvalidationContainer()) |
continue; |