Revert "Don't invalidate scrolling container layer when scrolling contents need invalidation"

Source/core/rendering/compositing/CompositedLayerMapping.cpp

Index: Source/core/rendering/compositing/CompositedLayerMapping.cpp
diff --git a/Source/core/rendering/compositing/CompositedLayerMapping.cpp b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
index 116d2f2517af80a5f98f438a99bc2a5a448ffda6..eb1ccfc0c3844b84d71d3dc170c6612f44f55eb4 100644
--- a/Source/core/rendering/compositing/CompositedLayerMapping.cpp
+++ b/Source/core/rendering/compositing/CompositedLayerMapping.cpp
@@ -1357,9 +1357,8 @@ enum ApplyToGraphicsLayersModeFlags {
     ApplyToScrollbarLayers = (1 << 2),
     ApplyToBackgroundLayer = (1 << 3),
     ApplyToMaskLayers = (1 << 4),
-    ApplyToContentLayers = (1 << 5), // This doesn't include scrollingContentsLayer.
-    ApplyToScrollingContentsLayer = (1 << 6),
-    ApplyToAllGraphicsLayers = (ApplyToSquashingLayer | ApplyToScrollbarLayers | ApplyToBackgroundLayer | ApplyToMaskLayers | ApplyToLayersAffectedByPreserve3D | ApplyToContentLayers | ApplyToScrollingContentsLayer)
+    ApplyToContentLayers = (1 << 5),
+    ApplyToAllGraphicsLayers = (ApplyToSquashingLayer | ApplyToScrollbarLayers | ApplyToBackgroundLayer | ApplyToMaskLayers | ApplyToLayersAffectedByPreserve3D | ApplyToContentLayers)
 };
 typedef unsigned ApplyToGraphicsLayersMode;
 
@@ -1378,7 +1377,7 @@ static void ApplyToGraphicsLayers(const CompositedLayerMapping* mapping, const F
         f(mapping->scrollingLayer());
     if ((mode & ApplyToLayersAffectedByPreserve3D) && mapping->scrollingBlockSelectionLayer())
         f(mapping->scrollingBlockSelectionLayer());
-    if (((mode & ApplyToLayersAffectedByPreserve3D) || (mode & ApplyToScrollingContentsLayer)) && mapping->scrollingContentsLayer())
+    if (((mode & ApplyToLayersAffectedByPreserve3D) || (mode & ApplyToContentLayers)) && mapping->scrollingContentsLayer())
         f(mapping->scrollingContentsLayer());
     if (((mode & ApplyToLayersAffectedByPreserve3D) || (mode & ApplyToContentLayers)) && mapping->foregroundLayer())
         f(mapping->foregroundLayer());
@@ -2060,25 +2059,6 @@ void CompositedLayerMapping::setContentsNeedDisplayInRect(const LayoutRect& r, P
     ApplyToGraphicsLayers(this, functor, ApplyToContentLayers);
 }
 
-void CompositedLayerMapping::setScrollingContentsNeedDisplay()
-{
-    ASSERT(!paintsIntoCompositedAncestor());
-    ApplyToGraphicsLayers(this, SetContentsNeedsDisplayFunctor(), ApplyToScrollingContentsLayer);
-}
-
-// FIXME: Temporarily r is in the coordinate space of the scrolling container layer.
-// Will make it in the coordinate space of the scrolling contents layer. crbug.com/416539.
-void CompositedLayerMapping::setScrollingContentsNeedDisplayInRect(const LayoutRect& r, PaintInvalidationReason invalidationReason)
-{
-    ASSERT(!paintsIntoCompositedAncestor());
-
-    SetContentsNeedsDisplayInRectFunctor functor = {
-        pixelSnappedIntRect(r.location() + m_owningLayer.subpixelAccumulation(), r.size()),
-        invalidationReason
-    };
-    ApplyToGraphicsLayers(this, functor, ApplyToScrollingContentsLayer);
-}
-
 const GraphicsLayerPaintInfo* CompositedLayerMapping::containingSquashedLayer(const RenderObject* renderObject, const Vector<GraphicsLayerPaintInfo>& layers, unsigned maxSquashedLayerIndex)
 {
     for (size_t i = 0; i < layers.size() && i < maxSquashedLayerIndex; ++i) {