Changeset 157940 in webkit

Timestamp:

Oct 24, 2013, 11:41:42 AM (13 years ago)

Author:

akling@apple.com

Message:

SVG: RenderElement-ize intersectRepaintRectWithResources().
<​https://webkit.org/b/123278>

SVGRenderSupport::intersectRepaintRectWithResources() is only ever
called with non-text renderers so make it take RenderElement&.

Had to tweak RenderSVGResource::resourceBoundingBox() to take the
renderer by reference.

Reviewed by Antti Koivisto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGContainer.cpp (modified) (1 diff)
• rendering/svg/RenderSVGImage.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResource.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceClipper.cpp (modified) (2 diffs)
• rendering/svg/RenderSVGResourceClipper.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceFilter.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceFilter.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceGradient.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceMarker.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceMasker.cpp (modified) (1 diff)
• rendering/svg/RenderSVGResourceMasker.h (modified) (1 diff)
• rendering/svg/RenderSVGResourcePattern.h (modified) (1 diff)
• rendering/svg/RenderSVGResourceSolidColor.h (modified) (1 diff)
• rendering/svg/RenderSVGRoot.cpp (modified) (1 diff)
• rendering/svg/RenderSVGShape.cpp (modified) (1 diff)
• rendering/svg/RenderSVGText.cpp (modified) (1 diff)
• rendering/svg/SVGRenderSupport.cpp (modified) (1 diff)
• rendering/svg/SVGRenderSupport.h (modified) (1 diff)
• rendering/svg/SVGRenderTreeAsText.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-24  Andreas Kling  <akling@apple.com>
+
+        SVG: RenderElement-ize intersectRepaintRectWithResources().
+        <https://webkit.org/b/123278>
+
+        SVGRenderSupport::intersectRepaintRectWithResources() is only ever
+        called with non-text renderers so make it take RenderElement&.
+
+        Had to tweak RenderSVGResource::resourceBoundingBox() to take the
+        renderer by reference.
+
+        Reviewed by Antti Koivisto.
+
 2013-10-24  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp

@@ -170 +170 @@
 {
     SVGRenderSupport::computeContainerBoundingBoxes(this, m_objectBoundingBox, m_objectBoundingBoxValid, m_strokeBoundingBox, m_repaintBoundingBox);
-    SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingBox);
+    SVGRenderSupport::intersectRepaintRectWithResources(*this, m_repaintBoundingBox);
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGImage.cpp

@@ -99 +99 @@
     if (m_needsBoundariesUpdate) {
         m_repaintBoundingBoxExcludingShadow = m_objectBoundingBox;
-        SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingBoxExcludingShadow);
+        SVGRenderSupport::intersectRepaintRectWithResources(*this, m_repaintBoundingBoxExcludingShadow);
 
         m_repaintBoundingBox = m_repaintBoundingBoxExcludingShadow;

trunk/Source/WebCore/rendering/svg/RenderSVGResource.h

@@ -65 +65 @@
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) = 0;
     virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short, const Path*, const RenderSVGShape*) { }
-    virtual FloatRect resourceBoundingBox(RenderObject*) = 0;
+    virtual FloatRect resourceBoundingBox(const RenderObject&) = 0;
 
     virtual RenderSVGResourceType resourceType() const = 0;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp

@@ -310 +310 @@
 }
 
-FloatRect RenderSVGResourceClipper::resourceBoundingBox(RenderObject* object)
+FloatRect RenderSVGResourceClipper::resourceBoundingBox(const RenderObject& object)
 {
     // Resource was not layouted yet. Give back the boundingBox of the object.
     if (selfNeedsLayout())
-        return object->objectBoundingBox();
+        return object.objectBoundingBox();
     
     if (m_clipBoundaries.isEmpty())
@@ -320 +320 @@
 
     if (clipPathElement().clipPathUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
-        FloatRect objectBoundingBox = object->objectBoundingBox();
+        FloatRect objectBoundingBox = object.objectBoundingBox();
         AffineTransform transform;
         transform.translate(objectBoundingBox.x(), objectBoundingBox.y());

trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h

@@ -57 +57 @@
     // FIXME: We made applyClippingToContext public because we cannot call applyResource on HTML elements (it asserts on RenderObject::objectBoundingBox)
     bool applyClippingToContext(RenderObject*, const FloatRect&, const FloatRect&, GraphicsContext*);
-    virtual FloatRect resourceBoundingBox(RenderObject*);
+    virtual FloatRect resourceBoundingBox(const RenderObject&) OVERRIDE;
 
     virtual RenderSVGResourceType resourceType() const { return ClipperResourceType; }

trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp

@@ -312 +312 @@
 }
 
-FloatRect RenderSVGResourceFilter::resourceBoundingBox(RenderObject* object)
-{
-    return SVGLengthContext::resolveRectangle<SVGFilterElement>(&filterElement(), filterElement().filterUnits(), object->objectBoundingBox());
+FloatRect RenderSVGResourceFilter::resourceBoundingBox(const RenderObject& object)
+{
+    return SVGLengthContext::resolveRectangle<SVGFilterElement>(&filterElement(), filterElement().filterUnits(), object.objectBoundingBox());
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h

@@ -78 +78 @@
     virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*);
 
-    virtual FloatRect resourceBoundingBox(RenderObject*);
+    virtual FloatRect resourceBoundingBox(const RenderObject&) OVERRIDE;
 
     std::unique_ptr<SVGFilterBuilder> buildPrimitives(SVGFilter*);

trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h

@@ -53 +53 @@
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode) OVERRIDE FINAL;
     virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) OVERRIDE FINAL;
-    virtual FloatRect resourceBoundingBox(RenderObject*) OVERRIDE FINAL { return FloatRect(); }
+    virtual FloatRect resourceBoundingBox(const RenderObject&) OVERRIDE FINAL { return FloatRect(); }
 
 protected:

trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h

@@ -57 +57 @@
 
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short) { return false; }
-    virtual FloatRect resourceBoundingBox(RenderObject*) { return FloatRect(); }
+    virtual FloatRect resourceBoundingBox(const RenderObject&) OVERRIDE { return FloatRect(); }
 
     FloatPoint referencePoint() const;

trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp

@@ -162 +162 @@
 }
 
-FloatRect RenderSVGResourceMasker::resourceBoundingBox(RenderObject* object)
+FloatRect RenderSVGResourceMasker::resourceBoundingBox(const RenderObject& object)
 {
-    FloatRect objectBoundingBox = object->objectBoundingBox();
+    FloatRect objectBoundingBox = object.objectBoundingBox();
     FloatRect maskBoundaries = SVGLengthContext::resolveRectangle<SVGMaskElement>(&maskElement(), maskElement().maskUnits(), objectBoundingBox);
 

trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h

@@ -49 +49 @@
     virtual void removeClientFromCache(RenderObject*, bool markForInvalidation = true);
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode);
-    virtual FloatRect resourceBoundingBox(RenderObject*);
+    virtual FloatRect resourceBoundingBox(const RenderObject&) OVERRIDE;
 
     SVGUnitTypes::SVGUnitType maskUnits() const { return maskElement().maskUnits(); }

trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h

@@ -54 +54 @@
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode);
     virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*);
-    virtual FloatRect resourceBoundingBox(RenderObject*) { return FloatRect(); }
+    virtual FloatRect resourceBoundingBox(const RenderObject&) OVERRIDE { return FloatRect(); }
 
     virtual RenderSVGResourceType resourceType() const { return s_resourceType; }

trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h

@@ -38 +38 @@
     virtual bool applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short resourceMode);
     virtual void postApplyResource(RenderObject*, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*);
-    virtual FloatRect resourceBoundingBox(RenderObject*) { return FloatRect(); }
+    virtual FloatRect resourceBoundingBox(const RenderObject&) OVERRIDE { return FloatRect(); }
 
     virtual RenderSVGResourceType resourceType() const { return s_resourceType; }

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

@@ -400 +400 @@
 {
     SVGRenderSupport::computeContainerBoundingBoxes(this, m_objectBoundingBox, m_objectBoundingBoxValid, m_strokeBoundingBox, m_repaintBoundingBoxExcludingShadow);
-    SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingBoxExcludingShadow);
+    SVGRenderSupport::intersectRepaintRectWithResources(*this, m_repaintBoundingBoxExcludingShadow);
     m_repaintBoundingBoxExcludingShadow.inflate(borderAndPaddingWidth());
 

trunk/Source/WebCore/rendering/svg/RenderSVGShape.cpp

@@ -405 +405 @@
 {
     m_repaintBoundingBoxExcludingShadow = strokeBoundingBox();
-    SVGRenderSupport::intersectRepaintRectWithResources(this, m_repaintBoundingBoxExcludingShadow);
+    SVGRenderSupport::intersectRepaintRectWithResources(*this, m_repaintBoundingBoxExcludingShadow);
 
     m_repaintBoundingBox = m_repaintBoundingBoxExcludingShadow;

trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp

@@ -528 +528 @@
 {
     FloatRect repaintRect = strokeBoundingBox();
-    SVGRenderSupport::intersectRepaintRectWithResources(this, repaintRect);
+    SVGRenderSupport::intersectRepaintRectWithResources(*this, repaintRect);
 
     if (const ShadowData* textShadow = style()->textShadow())

trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp

@@ -372 +372 @@
 }
 
-void SVGRenderSupport::intersectRepaintRectWithResources(const RenderObject* object, FloatRect& repaintRect)
-{
-    ASSERT(object);
-
-    RenderObject* renderer = const_cast<RenderObject*>(object);
-    SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+void SVGRenderSupport::intersectRepaintRectWithResources(const RenderElement& renderer, FloatRect& repaintRect)
+{
+    SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(&renderer);
     if (!resources)
         return;

trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h

@@ -55 +55 @@
 
     // Calculates the repaintRect in combination with filter, clipper and masker in local coordinates.
-    static void intersectRepaintRectWithResources(const RenderObject*, FloatRect&);
+    static void intersectRepaintRectWithResources(const RenderElement&, FloatRect&);
 
     // Determines whether a container needs to be laid out because it's filtered and a child is being laid out.

trunk/Source/WebCore/rendering/svg/SVGRenderTreeAsText.cpp

@@ -650 +650 @@
             ts << " ";
             writeStandardPrefix(ts, *masker, 0);
-            ts << " " << masker->resourceBoundingBox(&renderer) << "\n";
+            ts << " " << masker->resourceBoundingBox(renderer) << "\n";
         }
     }
@@ -660 +660 @@
             ts << " ";
             writeStandardPrefix(ts, *clipper, 0);
-            ts << " " << clipper->resourceBoundingBox(&renderer) << "\n";
+            ts << " " << clipper->resourceBoundingBox(renderer) << "\n";
         }
     }
@@ -671 +671 @@
             ts << " ";
             writeStandardPrefix(ts, *filter, 0);
-            ts << " " << filter->resourceBoundingBox(&renderer) << "\n";
+            ts << " " << filter->resourceBoundingBox(renderer) << "\n";
         }
     }