| Index: Source/core/rendering/svg/RenderSVGModelObject.cpp
|
| diff --git a/Source/core/rendering/svg/RenderSVGModelObject.cpp b/Source/core/rendering/svg/RenderSVGModelObject.cpp
|
| index 09495326cbd5fe04118cdfbdef2c37ad39a5785c..f96348ddb1d769b6d76fbb1bd464ecd7fed97679 100644
|
| --- a/Source/core/rendering/svg/RenderSVGModelObject.cpp
|
| +++ b/Source/core/rendering/svg/RenderSVGModelObject.cpp
|
| @@ -50,14 +50,14 @@ bool RenderSVGModelObject::isChildAllowed(RenderObject* child, RenderStyle*) con
|
| return child->isSVG() && !(child->isSVGInline() || child->isSVGInlineText());
|
| }
|
|
|
| -LayoutRect RenderSVGModelObject::clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const
|
| +LayoutRect RenderSVGModelObject::clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const
|
| {
|
| - return SVGRenderSupport::clippedOverflowRectForRepaint(this, repaintContainer);
|
| + return SVGRenderSupport::clippedOverflowRectForRepaint(this, paintInvalidationContainer);
|
| }
|
|
|
| -void RenderSVGModelObject::computeFloatRectForRepaint(const RenderLayerModelObject* repaintContainer, FloatRect& repaintRect, bool fixed) const
|
| +void RenderSVGModelObject::computeFloatRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, FloatRect& paintInvalidationRect, bool fixed) const
|
| {
|
| - SVGRenderSupport::computeFloatRectForRepaint(this, repaintContainer, repaintRect, fixed);
|
| + SVGRenderSupport::computeFloatRectForRepaint(this, paintInvalidationContainer, paintInvalidationRect, fixed);
|
| }
|
|
|
| void RenderSVGModelObject::mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState& transformState, MapCoordinatesFlags, bool* wasFixed) const
|
| @@ -121,7 +121,7 @@ bool RenderSVGModelObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, co
|
| // returns incorrect values for SVG objects. Overriding this method provides access to the absolute bounds.
|
| void RenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads)
|
| {
|
| - quads.append(localToAbsoluteQuad(FloatQuad(repaintRectInLocalCoordinates())));
|
| + quads.append(localToAbsoluteQuad(FloatQuad(paintInvalidationRectInLocalCoordinates())));
|
| }
|
|
|
| void RenderSVGModelObject::invalidateTreeAfterLayout(const RenderLayerModelObject& paintInvalidationContainer)
|
| @@ -138,9 +138,9 @@ void RenderSVGModelObject::invalidateTreeAfterLayout(const RenderLayerModelObjec
|
|
|
| const LayoutRect oldPaintInvalidationRect = previousPaintInvalidationRect();
|
| const LayoutPoint oldPositionFromPaintInvalidationContainer = previousPositionFromPaintInvalidationContainer();
|
| - const RenderLayerModelObject& newPaintInvalidationContainer = *containerForRepaint();
|
| - setPreviousPaintInvalidationRect(clippedOverflowRectForRepaint(&newPaintInvalidationContainer));
|
| - setPreviousPositionFromPaintInvalidationContainer(positionFromRepaintContainer(&newPaintInvalidationContainer));
|
| + const RenderLayerModelObject& newPaintInvalidationContainer = *containerForPaintInvalidation();
|
| + setPreviousPaintInvalidationRect(clippedOverflowRectForPaintInvalidation(&newPaintInvalidationContainer));
|
| + setPreviousPositionFromPaintInvalidationContainer(positionFromPaintInvalidationContainer(&newPaintInvalidationContainer));
|
|
|
| // If an ancestor container had its transform changed, then we just
|
| // need to update the RenderSVGModelObject's repaint rect above. The invalidation
|
| @@ -159,7 +159,7 @@ void RenderSVGModelObject::invalidateTreeAfterLayout(const RenderLayerModelObjec
|
|
|
| const LayoutRect& newPaintInvalidationRect = previousPaintInvalidationRect();
|
| const LayoutPoint& newPositionFromPaintInvalidationContainer = previousPositionFromPaintInvalidationContainer();
|
| - invalidatePaintAfterLayoutIfNeeded(containerForRepaint(),
|
| + invalidatePaintAfterLayoutIfNeeded(containerForPaintInvalidation(),
|
| shouldDoFullPaintInvalidationAfterLayout(), oldPaintInvalidationRect, oldPositionFromPaintInvalidationContainer,
|
| &newPaintInvalidationRect, &newPositionFromPaintInvalidationContainer);
|
|
|
|
|