Changeset 159912 in webkit

Timestamp:

Dec 1, 2013 9:44:16 PM (10 years ago)

Author:

akling@apple.com

Message:

SVG: Intersection/enclosure checks should use RenderElement.
<​https://webkit.org/b/125058>

Make RenderSVGModelObject's checkIntersection() and checkEnclosure()
take RenderElement* instead of RenderObject*. They are only ever
called with SVGElement's renderers.

Reviewed by Sam Weinig.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.cpp (modified) (3 diffs)
• rendering/svg/RenderSVGModelObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-01  Andreas Kling  <akling@apple.com>
+
+        SVG: Intersection/enclosure checks should use RenderElement.
+        <https://webkit.org/b/125058>
+
+        Make RenderSVGModelObject's checkIntersection() and checkEnclosure()
+        take RenderElement* instead of RenderObject*. They are only ever
+        called with SVGElement's renderers.
+
+        Reviewed by Sam Weinig.
+
 2013-12-01  Andreas Kling  <akling@apple.com>
 

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

@@ -156 +156 @@
 // One of the element types that can cause graphics to be drawn onto the target canvas. Specifically: circle, ellipse,
 // image, line, path, polygon, polyline, rect, text and use.
-static bool isGraphicsElement(RenderObject* renderer)
+static bool isGraphicsElement(const RenderElement& renderer)
 {
-    return renderer->isSVGShape() || renderer->isSVGText() || renderer->isSVGImage() || renderer->node()->hasTagName(SVGNames::useTag);
+    return renderer.isSVGShape() || renderer.isSVGText() || renderer.isSVGImage() || renderer.element()->hasTagName(SVGNames::useTag);
 }
 
@@ -168 +168 @@
 }
     
-bool RenderSVGModelObject::checkIntersection(RenderObject* renderer, const FloatRect& rect)
+bool RenderSVGModelObject::checkIntersection(RenderElement* renderer, const FloatRect& rect)
 {
     if (!renderer || renderer->style().pointerEvents() == PE_NONE)
         return false;
-    if (!isGraphicsElement(renderer))
+    if (!isGraphicsElement(*renderer))
         return false;
     AffineTransform ctm;
-    SVGElement* svgElement = toSVGElement(renderer->node());
+    SVGElement* svgElement = toSVGElement(renderer->element());
     getElementCTM(svgElement, ctm);
     ASSERT(svgElement->renderer());
@@ -181 +181 @@
 }
 
-bool RenderSVGModelObject::checkEnclosure(RenderObject* renderer, const FloatRect& rect)
+bool RenderSVGModelObject::checkEnclosure(RenderElement* renderer, const FloatRect& rect)
 {
     if (!renderer || renderer->style().pointerEvents() == PE_NONE)
         return false;
-    if (!isGraphicsElement(renderer))
+    if (!isGraphicsElement(*renderer))
         return false;
     AffineTransform ctm;
-    SVGElement* svgElement = toSVGElement(renderer->node());
+    SVGElement* svgElement = toSVGElement(renderer->element());
     getElementCTM(svgElement, ctm);
     ASSERT(svgElement->renderer());

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

@@ -60 +60 @@
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
 
-    static bool checkIntersection(RenderObject*, const FloatRect&);
-    static bool checkEnclosure(RenderObject*, const FloatRect&);
+    static bool checkIntersection(RenderElement*, const FloatRect&);
+    static bool checkEnclosure(RenderElement*, const FloatRect&);
 
     virtual FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const { return repaintRectInLocalCoordinates(); }