Fix Compositing of Opaque Scrolling Layers and Add Tests

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

Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp
index 8d80825f23199f2d5d01d3ce2e10c3a0149aeaa6..91e14d1eab3038bd7d77472d9e8b0f2e90bb1289 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMappingTest.cpp
@@ -45,12 +45,6 @@ protected:
         return graphicsLayer->m_previousInterestRect;
     }
 
-    bool shouldPaintBackgroundOntoScrollingContentsLayer(const char* elementId)
-    {
-        CompositedLayerMapping* mapping = toLayoutBlock(getLayoutObjectByElementId(elementId))->layer()->compositedLayerMapping();
-        return mapping->shouldPaintBackgroundOntoScrollingContentsLayer();
-    }
-
 private:
     void SetUp() override
     {
@@ -632,45 +626,4 @@ TEST_F(CompositedLayerMappingTest, ScrollingContentsAndForegroundLayerPaintingPh
     EXPECT_FALSE(mapping->foregroundLayer());
 }
 
-TEST_F(CompositedLayerMappingTest, ShouldPaintBackgroundOntoScrollingContentsLayer)
-{
-    document().frame()->settings()->setPreferCompositingToLCDTextEnabled(true);
-    setBodyInnerHTML(
-        "<style>.scroller { overflow: scroll; will-change: transform; width: 300px; height: 300px;} .spacer { height: 1000px; }</style>"
-        "<div id='scroller1' class='scroller' style='background: white local;'>"
-        "    <div id='negative-composited-child' style='background-color: red; width: 1px; height: 1px; position: absolute; backface-visibility: hidden; z-index: -1'></div>"
-        "    <div class='spacer'></div>"
-        "</div>"
-        "<div id='scroller2' class='scroller' style='background: white content-box; padding: 10px;'><div class='spacer'></div></div>"
-        "<div id='scroller3' class='scroller' style='background: white local content-box; padding: 10px;'><div class='spacer'></div></div>"
-        "<div id='scroller4' class='scroller' style='background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUg), white local;'><div class='spacer'></div></div>"
-        "<div id='scroller5' class='scroller' style='background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUg) local, white local;'><div class='spacer'></div></div>"
-        "<div id='scroller6' class='scroller' style='background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUg) local, white padding-box; padding: 10px;'><div class='spacer'></div></div>"
-        "<div id='scroller7' class='scroller' style='background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUg) local, white content-box; padding: 10px;'><div class='spacer'></div></div>"
-        );
-
-    // First scroller cannot paint background into scrolling contents layer because it has a negative z-index child.
-    EXPECT_FALSE(shouldPaintBackgroundOntoScrollingContentsLayer("scroller1"));
-
-    // Second scroller cannot paint background into scrolling contents layer because it has a content-box clip without local attachment.
-    EXPECT_FALSE(shouldPaintBackgroundOntoScrollingContentsLayer("scroller2"));
-
-    // Third scroller can paint background into scrolling contents layer.
-    EXPECT_TRUE(shouldPaintBackgroundOntoScrollingContentsLayer("scroller3"));
-
-    // Fourth scroller cannot paint background into scrolling contents layer because the background image is not locally attached.
-    EXPECT_FALSE(shouldPaintBackgroundOntoScrollingContentsLayer("scroller4"));
-
-    // Fifth scroller can paint background into scrolling contents layer because both the image and color are locally attached.
-    EXPECT_TRUE(shouldPaintBackgroundOntoScrollingContentsLayer("scroller5"));
-
-    // Sixth scroller can paint background into scrolling contents layer because the image is locally attached and even though
-    // the color is not, it is filled to the padding box so it will be drawn the same as a locally attached background.
-    EXPECT_TRUE(shouldPaintBackgroundOntoScrollingContentsLayer("scroller6"));
-
-    // Seventh scroller cannot paint background into scrolling contents layer because the color is filled to the content
-    // box and we have padding so it is not equivalent to a locally attached background.
-    EXPECT_FALSE(shouldPaintBackgroundOntoScrollingContentsLayer("scroller7"));
-}
-
 } // namespace blink