Fix Compositing of Opaque Scrolling Layers and Add Tests

third_party/WebKit/Source/core/paint/PaintLayer.cpp

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 05c91d6393cec8279a32ed3c4362314dded6f284..4601e9f7d8c54e8b76179eaedf65928a587b9e78 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -2356,6 +2356,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)
@@ -2463,7 +2471,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;