Move all fast-path paint invalidation mapping into PaintInvalidationState

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

 /*
  * Copyright (c) 2009, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 // but not all. (e.g. LayoutSVGForeignObject, LayoutSVGBlock) thus methods
 // required by SVG layoutObjects need to be declared on LayoutObject, but shared
 // logic can go in this class or in SVGLayoutSupport.
 
 class LayoutSVGModelObject : public LayoutObject {
 public:
     explicit LayoutSVGModelObject(SVGElement*);
 
     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;
 
     void computeLayerHitTestRects(LayerHitTestRects&) const final;
 
     SVGElement* element() const { return toSVGElement(LayoutObject::node()); }
 
     bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectSVG || LayoutObject::isOfType(type); }
 
 protected:
     void addLayerHitTestRects(LayerHitTestRects&, const PaintLayer* currentCompositedLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const final;
     void willBeDestroyed() override;
 
 private:
     // LayoutSVGModelObject subclasses should use element() instead.
     void node() const = delete;
 
     // This method should never be called, SVG uses a different nodeAtPoint method
     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:
     FloatRect m_paintInvalidationBoundingBox;
 };
 
 } // namespace blink
 
 #endif