Get rid of computeFloatRectForPaintInvalidation

Source/core/rendering/svg/RenderSVGRoot.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2007, 2008, 2009 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Google, Inc.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 310 matching lines @@
         LayoutRect decoratedPaintInvalidationRect = unionRect(localSelectionRect(false), visualOverflowRect());
         paintInvalidationRect.unite(decoratedPaintInvalidationRect);
     }
 
     // Compute the paint invalidation rect in the parent coordinate space.
     LayoutRect rect = enclosingIntRect(paintInvalidationRect);
     RenderReplaced::mapRectToPaintInvalidationBacking(paintInvalidationContainer, rect, paintInvalidationState);
     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.
 // Callers with local SVG viewport coordinates should first apply the localToBorderBoxTransform
 // to convert from SVG viewport coordinates to local CSS box coordinates.
 void RenderSVGRoot::mapLocalToContainer(const RenderLayerModelObject* paintInvalidationContainer, TransformState& transformState, MapCoordinatesFlags mode, bool* wasFixed, const PaintInvalidationState* paintInvalidationState) const
 {
     ASSERT(mode & ~IsFixed); // We should have no fixed content in the SVG rendering tree.
     // We used to have this ASSERT here, but we removed it when enabling layer squashing.
     // See http://crbug.com/364901
@@ skipping 48 matching lines @@
             updateHitTestResult(result, pointInBorderBox);
             if (!result.addNodeToRectBasedTestResult(node(), request, locationInContainer, boundsRect))
                 return true;
         }
     }
 
     return false;
 }
 
 }