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

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

Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h
index 126b0b9b48a9a27782d283fb4597eea2f3a8321b..7a9e6e537ae852acc77d46b34645018d4045ab4e 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.h
@@ -128,14 +128,10 @@
     void setContentsNeedDisplay();
     // LayoutRect is in the coordinate space of the layer's layout object.
     void setContentsNeedDisplayInRect(const LayoutRect&, PaintInvalidationReason, const DisplayItemClient&);
-    // Invalidates just scrolling content layers.
-    void setScrollingContentsNeedDisplayInRect(const LayoutRect&, PaintInvalidationReason, const DisplayItemClient&);
 
     // This is called only if we are tracking paint invalidation for testing, or ENABLE(ASSERT)
     // for error checking and debugging.
     void displayItemClientWasInvalidated(const DisplayItemClient&, PaintInvalidationReason);
-    // Invalidates just scrolling content layers.
-    void scrollingDisplayItemClientWasInvalidated(const DisplayItemClient&, PaintInvalidationReason);
 
     // Notification from the layoutObject that its content changed.
     void contentChanged(ContentChangeType);
@@ -219,8 +215,6 @@
     const GraphicsLayerPaintInfo* containingSquashedLayer(const LayoutObject*, unsigned maxSquashedLayerIndex);
 
     void updateScrollingBlockSelection();
-
-    void adjustForCompositedScrolling(const GraphicsLayer*, IntSize& offset) const;
 
 private:
     IntRect recomputeInterestRect(const GraphicsLayer*) const;
@@ -446,11 +440,6 @@
     LayoutRect m_compositedBounds;
 
     LayoutSize m_contentOffsetInCompositingLayer;
-
-    // We keep track of the scrolling contents offset, so that when it changes we can notify the ScrollingCoordinator, which
-    // passes on main-thread scrolling updates to the compositor.
-    DoubleSize m_scrollingContentsOffset;
-
     unsigned m_contentOffsetInCompositingLayerDirty : 1;
 
     unsigned m_pendingUpdateScope : 2;