Move all fast-path paint invalidation mapping into PaintInvalidationState

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 92 matching lines @@
     float zoomFactor() const;
 
     FrameView* frameView() const { return m_frameView; }
 
     enum ViewportConstrainedPosition {
         IsNotFixedPosition,
         IsFixedPosition,
     };
 
     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();
 
     void paint(const PaintInfo&, const LayoutPoint&) const override;
     void paintBoxDecorationBackground(const PaintInfo&, const LayoutPoint&) const override;
 
     enum SelectionPaintInvalidationMode { PaintInvalidationNewXOROld, PaintInvalidationNewMinusOld };
     void setSelection(LayoutObject* start, int startPos, LayoutObject*, int endPos, SelectionPaintInvalidationMode = PaintInvalidationNewXOROld);
     void clearSelection();
@@ skipping 82 matching lines @@
     void registerMediaForPositionChangeNotification(LayoutMedia&);
     void unregisterMediaForPositionChangeNotification(LayoutMedia&);
     // Notify all registered LayoutMedias that their position on-screen might
     // have changed.  visibleRect is the clipping boundary.
     void sendMediaPositionChangeNotifications(const IntRect& visibleRect);
 
     // The rootLayerScrolls setting will ultimately determine whether FrameView
     // 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; }

[chrishtr, 2016/03/24 01:05:42]

This is pretty weird. Is it really not worth an extra parameter, with a
LayoutView-specific overrride of localToAncestorPoint?

+
 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;
     void computeSelfHitTestRects(Vector<LayoutRect>&, const LayoutPoint& layerOffset) const override;
 
     void layoutContent();
 #if ENABLE(ASSERT)
     void checkLayoutState();
 #endif
 
@@ skipping 45 matching lines @@
     RefPtr<IntervalArena> m_intervalArena;
 
     LayoutQuote* m_layoutQuoteHead;
     unsigned m_layoutCounterCount;
 
     unsigned m_hitTestCount;
     unsigned m_hitTestCacheHits;
     OwnPtrWillBePersistent<HitTestCache> m_hitTestCache;
 
     Vector<LayoutMedia*> m_mediaForPositionNotification;
+
+    static bool s_viewClippingAndScrollOffsetDisabled;
 };
 
 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutView, isLayoutView());
 
 } // namespace blink
 
 #endif // LayoutView_h