Changeset 152399 in webkit

Timestamp:

Jul 4, 2013 6:58:13 AM (11 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Change static_cast<SVGImageElement*> with toSVGImageElement
​https://bugs.webkit.org/show_bug.cgi?id=118387

Reviewed by Andreas Kling.

As a step to change static_cast with toXXX, static_cast<SVGImageElement*> can
be changed with toSVGImageElement().

Blink merge from ​https://src.chromium.org/viewvc/blink?view=rev&revision=153557

• rendering/svg/RenderSVGImage.cpp:

(WebCore::RenderSVGImage::updateImageViewport):
(WebCore::RenderSVGImage::layout):
(WebCore::RenderSVGImage::paintForeground):

• svg/SVGImageElement.h:

(WebCore::toSVGImageElement):

• svg/SVGImageLoader.cpp:

(WebCore::SVGImageLoader::dispatchLoadEvent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGImage.cpp (modified) (3 diffs)
• svg/SVGImageElement.h (modified) (1 diff)
• svg/SVGImageLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-04  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Change static_cast<SVGImageElement*> with toSVGImageElement
+        https://bugs.webkit.org/show_bug.cgi?id=118387
+
+        Reviewed by Andreas Kling.
+
+        As a step to change static_cast with toXXX, static_cast<SVGImageElement*> can
+        be changed with toSVGImageElement().
+
+        Blink merge from https://src.chromium.org/viewvc/blink?view=rev&revision=153557
+
+        * rendering/svg/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::updateImageViewport):
+        (WebCore::RenderSVGImage::layout):
+        (WebCore::RenderSVGImage::paintForeground):
+        * svg/SVGImageElement.h:
+        (WebCore::toSVGImageElement):
+        * svg/SVGImageLoader.cpp:
+        (WebCore::SVGImageLoader::dispatchLoadEvent):
+
 2013-07-04  Brian Holt  <brian.holt@samsung.com>
 

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

@@ -65 +65 @@
 bool RenderSVGImage::updateImageViewport()
 {
-    SVGImageElement* image = static_cast<SVGImageElement*>(node());
+    SVGImageElement* image = toSVGImageElement(node());
     FloatRect oldBoundaries = m_objectBoundingBox;
 
@@ -89 +89 @@
     bool transformOrBoundariesUpdate = m_needsTransformUpdate || m_needsBoundariesUpdate;
     if (m_needsTransformUpdate) {
-        m_localTransform = static_cast<SVGImageElement*>(node())->animatedLocalTransform();
+        m_localTransform = toSVGImageElement(node())->animatedLocalTransform();
         m_needsTransformUpdate = false;
     }
@@ -152 +152 @@
     FloatRect srcRect(0, 0, image->width(), image->height());
 
-    SVGImageElement* imageElement = static_cast<SVGImageElement*>(node());
+    SVGImageElement* imageElement = toSVGImageElement(node());
     imageElement->preserveAspectRatio().transformRect(destRect, srcRect);
 

trunk/Source/WebCore/svg/SVGImageElement.h

@@ -77 +77 @@
 };
 
+inline SVGImageElement* toSVGImageElement(Node* node)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->hasTagName(SVGNames::imageTag));
+    return static_cast<SVGImageElement*>(node);
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/svg/SVGImageLoader.cpp

@@ -43 +43 @@
         element()->dispatchEvent(Event::create(eventNames().errorEvent, false, false));
     else {
-        SVGImageElement* imageElement = static_cast<SVGImageElement*>(element());
+        SVGImageElement* imageElement = toSVGImageElement(element());
         if (imageElement->externalResourcesRequiredBaseValue())
             imageElement->sendSVGLoadEventIfPossible(true);