Move all fast-path paint invalidation mapping into PaintInvalidationState

third_party/WebKit/Source/core/layout/LayoutView.h

Index: third_party/WebKit/Source/core/layout/LayoutView.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutView.h b/third_party/WebKit/Source/core/layout/LayoutView.h
index af4a7dd9b99b4f8dfaab14be0bd7e3ee81759754..bcb6b150c176529ec3be5ab73bb5485dc14ad147 100644
--- a/third_party/WebKit/Source/core/layout/LayoutView.h
+++ b/third_party/WebKit/Source/core/layout/LayoutView.h
@@ -110,8 +110,8 @@ public:
     };
 
     static ViewportConstrainedPosition toViewportConstrainedPosition(EPosition position) { return position == FixedPosition ? IsFixedPosition : IsNotFixedPosition; }
-    void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, ViewportConstrainedPosition, const PaintInvalidationState*) const;
-    void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, const PaintInvalidationState*) const override;
+    void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, ViewportConstrainedPosition) const;
+    void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&) const override;
     void adjustViewportConstrainedOffset(LayoutRect&, ViewportConstrainedPosition) const;
 
     void invalidatePaintForViewAndCompositedLayers();
@@ -214,8 +214,12 @@ public:
     // or PaintLayerScrollableArea handle the scroll.
     ScrollResult scroll(ScrollGranularity, const FloatSize&) override;
 
+    // Disable view clipping and scroll offset adjustment for paint invalidation of FrameView scrollbars.
+    // TODO(wangxianzhu): Remove this when root-layer-scrolls launches.
+    static void setViewClippingAndScrollOffsetDisabled(bool b) { s_viewClippingAndScrollOffsetDisabled = b; }
+
 private:
-    void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const override;
+    void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr) const override;
 
     const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const override;
     void mapAncestorToLocal(const LayoutBoxModelObject*, TransformState&, MapCoordinatesFlags) const override;
@@ -281,6 +285,8 @@ private:
     OwnPtrWillBePersistent<HitTestCache> m_hitTestCache;
 
     Vector<LayoutMedia*> m_mediaForPositionNotification;
+
+    static bool s_viewClippingAndScrollOffsetDisabled;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutView, isLayoutView());