Move all fast-path paint invalidation mapping into PaintInvalidationState

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

Index: third_party/WebKit/Source/core/layout/LayoutInline.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutInline.h b/third_party/WebKit/Source/core/layout/LayoutInline.h
index 11a367cb8a4cbd50d942d59f376cea683393345e..8c250979e628ae7a8a670cf4a16b52d7bdfdf7e5 100644
--- a/third_party/WebKit/Source/core/layout/LayoutInline.h
+++ b/third_party/WebKit/Source/core/layout/LayoutInline.h
@@ -236,12 +236,12 @@ private:
     LayoutUnit offsetHeight() const final { return LayoutUnit(linesBoundingBox().height()); }
 
     LayoutRect absoluteClippedOverflowRect() const override;
-    LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
-    void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&, const PaintInvalidationState*) const final;
 
-    // This method differs from clippedOverflowRectForPaintInvalidation in that it includes
-    // the rects for culled inline boxes, which aren't necessary for paint invalidation.
-    LayoutRect clippedOverflowRect(const LayoutBoxModelObject*, const PaintInvalidationState* = nullptr) const;
+    // This method differs from visualOverflowRect in that it doesn't include the rects
+    // for culled inline boxes, which aren't necessary for paint invalidation.
+    LayoutRect localOverflowRectForPaintInvalidation() const override;
+
+    void mapToVisibleRectInAncestorSpace(const LayoutBoxModelObject* ancestor, LayoutRect&) const final;
 
     PositionWithAffinity positionForPoint(const LayoutPoint&) final;