Changeset 152615 in webkit

Timestamp:

Jul 14, 2013 6:59:31 AM (11 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Add toSVGFilterElement() and use it.
​https://bugs.webkit.org/show_bug.cgi?id=118653

Reviewed by Ryosuke Niwa.

We can use toSVGFilterElement() instead of using static_cast<..> to improve readability.
Blink also uses it.

No new tests, no behavior change.

• rendering/svg/RenderSVGResourceFilter.cpp:

(WebCore::RenderSVGResourceFilter::buildPrimitives):
(WebCore::RenderSVGResourceFilter::applyResource):
(WebCore::RenderSVGResourceFilter::resourceBoundingBox):

• rendering/svg/RenderSVGResourceFilter.h:

(WebCore::RenderSVGResourceFilter::filterUnits):
(WebCore::RenderSVGResourceFilter::primitiveUnits):

• rendering/svg/SVGResources.cpp:

(WebCore::targetReferenceFromResource):

• svg/SVGFilterElement.h:

(WebCore::toSVGFilterElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGResourceFilter.cpp (modified) (3 diffs)
• rendering/svg/RenderSVGResourceFilter.h (modified) (1 diff)
• rendering/svg/SVGResources.cpp (modified) (1 diff)
• svg/SVGFilterElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-14  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Add toSVGFilterElement() and use it.
+        https://bugs.webkit.org/show_bug.cgi?id=118653
+
+        Reviewed by Ryosuke Niwa.
+
+        We can use toSVGFilterElement() instead of using static_cast<..> to improve readability.
+        Blink also uses it.
+
+        No new tests, no behavior change.
+
+        * rendering/svg/RenderSVGResourceFilter.cpp:
+        (WebCore::RenderSVGResourceFilter::buildPrimitives):
+        (WebCore::RenderSVGResourceFilter::applyResource):
+        (WebCore::RenderSVGResourceFilter::resourceBoundingBox):
+        * rendering/svg/RenderSVGResourceFilter.h:
+        (WebCore::RenderSVGResourceFilter::filterUnits):
+        (WebCore::RenderSVGResourceFilter::primitiveUnits):
+        * rendering/svg/SVGResources.cpp:
+        (WebCore::targetReferenceFromResource):
+        * svg/SVGFilterElement.h:
+        (WebCore::toSVGFilterElement):
+
 2013-07-14  Kangil Han  <kangil.han@samsung.com>
 

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

@@ -98 +98 @@
 PassRefPtr<SVGFilterBuilder> RenderSVGResourceFilter::buildPrimitives(SVGFilter* filter)
 {
-    SVGFilterElement* filterElement = static_cast<SVGFilterElement*>(node());
+    SVGFilterElement* filterElement = toSVGFilterElement(node());
     FloatRect targetBoundingBox = filter->targetBoundingBox();
 
@@ -158 +158 @@
     FloatRect targetBoundingBox = object->objectBoundingBox();
 
-    SVGFilterElement* filterElement = static_cast<SVGFilterElement*>(node());
+    SVGFilterElement* filterElement = toSVGFilterElement(node());
     filterData->boundaries = SVGLengthContext::resolveRectangle<SVGFilterElement>(filterElement, filterElement->filterUnits(), targetBoundingBox);
     if (filterData->boundaries.isEmpty())
@@ -330 +330 @@
 FloatRect RenderSVGResourceFilter::resourceBoundingBox(RenderObject* object)
 {
-    if (SVGFilterElement* element = static_cast<SVGFilterElement*>(node()))
+    if (SVGFilterElement* element = toSVGFilterElement(node()))
         return SVGLengthContext::resolveRectangle<SVGFilterElement>(element, element->filterUnits(), object->objectBoundingBox());
 

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

@@ -82 +82 @@
     PassRefPtr<SVGFilterBuilder> buildPrimitives(SVGFilter*);
 
-    SVGUnitTypes::SVGUnitType filterUnits() const { return static_cast<SVGFilterElement*>(node())->filterUnits(); }
-    SVGUnitTypes::SVGUnitType primitiveUnits() const { return static_cast<SVGFilterElement*>(node())->primitiveUnits(); }
+    SVGUnitTypes::SVGUnitType filterUnits() const { return toSVGFilterElement(node())->filterUnits(); }
+    SVGUnitTypes::SVGUnitType primitiveUnits() const { return toSVGFilterElement(node())->primitiveUnits(); }
 
     void primitiveAttributeChanged(RenderObject*, const QualifiedName&);

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

@@ -150 +150 @@
 #if ENABLE(FILTERS)
     else if (element->hasTagName(SVGNames::filterTag))
-        target = static_cast<SVGFilterElement*>(element)->href();
+        target = toSVGFilterElement(element)->href();
 #endif
     else

trunk/Source/WebCore/svg/SVGFilterElement.h

@@ -76 +76 @@
 };
 
+inline SVGFilterElement* toSVGFilterElement(Node* node)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(SVGNames::filterTag));
+    return static_cast<SVGFilterElement*>(node);
+}
+
 }