Revert of Don't include scroll offset in offsetFromLayoutObject for scrolling contents layers.

third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp

Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
index cd3587ad63c36c9c01f3a8c43e808791cc8e3b93..9081857db32c0caf9d08620a6d0a46f5ebc4eb72 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp
@@ -412,11 +412,6 @@
     invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState);
 }
 
-static bool compositedScrollsWithRespectTo(const LayoutObject* layoutObject, const LayoutBoxModelObject& paintInvalidationContainer)
-{
-    return paintInvalidationContainer.usesCompositedScrolling() && layoutObject != &paintInvalidationContainer;
-}
-
 void LayoutBoxModelObject::setBackingNeedsPaintInvalidationInRect(const LayoutRect& r, PaintInvalidationReason invalidationReason, const LayoutObject& object) const
 {
     // TODO(wangxianzhu): Enable the following assert after paint invalidation for spv2 is ready.
@@ -433,15 +428,12 @@
             // Note: the subpixel accumulation of layer() does not need to be added here. It is already taken into account.
             squashingLayer->setNeedsDisplayInRect(enclosingIntRect(paintInvalidationRect), invalidationReason, object);
         }
-    } else if (compositedScrollsWithRespectTo(&object, *this)) {
-        layer()->compositedLayerMapping()->setScrollingContentsNeedDisplayInRect(r, invalidationReason, object);
     } else {
-        // TODO(chrishtr): we should be able to skip scrolling content layers in this case.
         layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, invalidationReason, object);
     }
 }
 
-void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayItemClient& displayItemClient, PaintInvalidationReason invalidationReason, const LayoutObject* layoutObject) const
+void LayoutBoxModelObject::invalidateDisplayItemClientOnBacking(const DisplayItemClient& displayItemClient, PaintInvalidationReason invalidationReason) const
 {
     displayItemClient.setDisplayItemsUncached();
 
@@ -456,10 +448,7 @@
         if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashingLayer())
             squashingLayer->displayItemClientWasInvalidated(displayItemClient, invalidationReason);
     } else if (CompositedLayerMapping* compositedLayerMapping = layer()->compositedLayerMapping()) {
-        if (compositedScrollsWithRespectTo(layoutObject, *this))
-            compositedLayerMapping->scrollingDisplayItemClientWasInvalidated(displayItemClient, invalidationReason);
-        else
-            compositedLayerMapping->displayItemClientWasInvalidated(displayItemClient, invalidationReason);
+        compositedLayerMapping->displayItemClientWasInvalidated(displayItemClient, invalidationReason);
     }
 }