Move all fast-path paint invalidation mapping into PaintInvalidationState

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

Index: third_party/WebKit/Source/core/layout/svg/LayoutSVGInline.h
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInline.h b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInline.h
index 2d851b1a90a00e2b7d45aa275aa3604ccf2587f3..24209fc52d55b11912a996442ed4682be1dbe5a0 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInline.h
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInline.h
@@ -44,14 +44,17 @@ public:
     FloatRect strokeBoundingBox() const final;
     FloatRect paintInvalidationRectInLocalSVGCoordinates() const final;
 
-    LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const final;
-    void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr, const PaintInvalidationState* = nullptr) const final;
+    LayoutRect absoluteClippedOverflowRect() const final;
+    void mapLocalToAncestor(const LayoutBoxModelObject* ancestor, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = nullptr) const final;
     const LayoutObject* pushMappingToContainer(const LayoutBoxModelObject* ancestorToStopAt, LayoutGeometryMap&) const final;
     void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const final;
 
 private:
     InlineFlowBox* createInlineFlowBox() final;
 
+    // This method should never be called. Should use paintInvalidationRectInLocalSVGCoordinates().

[chrishtr, 2016/03/25 22:18:53]

TODO to enforce? Not sure what this is for. What do these using declarations do?

[Xianzhu, 2016/03/25 22:27:15]

This 'using' hide LayoutObject::localOverflowRectForPaintInvalidation in private
section. and provide a chance to put the above comment. It's enforced by
ASSERT_NOT_REACHED() in LayoutObject::localOverflowRectForPaintInvalidtion.

Now I feel this seems not necessary and might be confusing. Going to remove
them, and put the comment for SVG in LayoutObject.h.

+    using LayoutObject::localOverflowRectForPaintInvalidation;
+
     void invalidateTreeIfNeeded(const PaintInvalidationState&) final;
 
     void willBeDestroyed() final;