Fix Compositing of Opaque Scrolling Layers and Add Tests

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

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 4f03f2696807dd4c33992714388dc38fc4f2cd14..fbdf3c2c357acf77843cf1a459590a2da47904d9 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
@@ -297,7 +297,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
@@ -2585,19 +2585,6 @@ bool CompositedLayerMapping::invalidateLayerIfNoPrecedingEntry(size_t indexToCle
     return false;
 }
 
-bool CompositedLayerMapping::shouldPaintBackgroundOntoScrollingContentsLayer() const
-{
-    // TODO(flackr): Add support for painting locally attached background images. https://crbug.com/625882
-    const FillLayer& backgroundLayer = m_owningLayer.layoutObject()->style()->backgroundLayers();
-    return !m_owningLayer.isRootLayer()
-        && m_owningLayer.scrollsOverflow()
-        && !backgroundLayer.image()
-        && !backgroundLayer.next()
-        && (backgroundLayer.attachment() == LocalBackgroundAttachment
-            || backgroundLayer.clip() == PaddingFillBox)
-        && !m_owningLayer.stackingNode()->hasNegativeZOrderList();
-}
-
 bool CompositedLayerMapping::updateSquashingLayerAssignment(PaintLayer* squashedLayer, size_t nextSquashedLayerIndex)
 {
     GraphicsLayerPaintInfo paintInfo;