Move all fast-path paint invalidation mapping into PaintInvalidationState

third_party/WebKit/Source/core/layout/svg/LayoutSVGModelObject.h

Index: third_party/WebKit/Source/core/layout/svg/LayoutSVGModelObject.h
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGModelObject.h b/third_party/WebKit/Source/core/layout/svg/LayoutSVGModelObject.h
index a9a29a76ffaaedc5825855b3c9f9a47afd4b67c6..08d48644b26ce21e4191f1f347542edfca3aa0bf 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGModelObject.h
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGModelObject.h
@@ -47,14 +47,13 @@ public:
 
     bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
 
-    LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
-
-    FloatRect paintInvalidationRectInLocalSVGCoordinates() const final { return m_paintInvalidationBoundingBox; }
+    LayoutRect absoluteClippedOverflowRect() const override;
+    FloatRect paintInvalidationRectInLocalSVGCoordinates() const override { return m_paintInvalidationBoundingBox; }
 
     void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const final;
     void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
 
-    void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const final;
+    void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr) const final;
     void mapAncestorToLocal(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip) const final;
     const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const final;
     void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
@@ -77,6 +76,9 @@ private:
     bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final;
     IntRect absoluteElementBoundingBoxRect() const final;
 
+    // This method should never be called. Should use paintInvalidationRectInLocalSVGCoordinates().
+    using LayoutObject::localOverflowRectForPaintInvalidation;
+
     void invalidateTreeIfNeeded(const PaintInvalidationState&) final;
 
 protected: