Get rid of computeFloatRectForPaintInvalidation

Source/core/rendering/svg/RenderSVGRoot.cpp

Index: Source/core/rendering/svg/RenderSVGRoot.cpp
diff --git a/Source/core/rendering/svg/RenderSVGRoot.cpp b/Source/core/rendering/svg/RenderSVGRoot.cpp
index dadbf2252401145717ca03cb052d3057536b5602..b4df9277e385ab8bd0dac871a59a46504b55d28d 100644
--- a/Source/core/rendering/svg/RenderSVGRoot.cpp
+++ b/Source/core/rendering/svg/RenderSVGRoot.cpp
@@ -328,19 +328,16 @@ LayoutRect RenderSVGRoot::clippedOverflowRectForPaintInvalidation(const RenderLa
     return rect;
 }
 
-void RenderSVGRoot::computeFloatRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, FloatRect& paintInvalidationRect, const PaintInvalidationState* paintInvalidationState) const
+void RenderSVGRoot::mapRectToPaintInvalidationBacking(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect, const PaintInvalidationState* paintInvalidationState) const
 {
-    // Apply our local transforms (except for x/y translation), then our shadow,
-    // and then call RenderBox's method to handle all the normal CSS Box model bits
-    paintInvalidationRect = m_localToBorderBoxTransform.mapRect(paintInvalidationRect);
+    // Note that we don't apply the border-box transform here - it's assumed
+    // that whoever called us has done that already.
 
     // Apply initial viewport clip
     if (shouldApplyViewportClip())
-        paintInvalidationRect.intersect(pixelSnappedBorderBoxRect());
+        rect.intersect(pixelSnappedBorderBoxRect());

[pdr., 2014/11/21 08:32:05]

PaintInvalidationState's ctor has something that looks a lot like this but is a
little different.

[pdr., 2014/11/21 08:32:05]

PaintInvalidationState's ctor has something that looks a lot like this but is a
little different. Should these be unified?

[fs, 2014/11/21 11:23:15]

They are the same thing, but in different coordinate spaces (w/ and w/o paint
offset). I think that unifying them would make for unnecessarily complicated
code - or at least I can't come up with something that feels like an
improvement. Ideas?

 
-    LayoutRect rect = enclosingIntRect(paintInvalidationRect);
     RenderReplaced::mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, paintInvalidationState);
-    paintInvalidationRect = rect;
 }
 
 // This method expects local CSS box coordinates.