Changeset 65116 in webkit

Timestamp:

Aug 10, 2010 7:34:31 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-10 Patrick Gansterer <​paroga@paroga.com>

Reviewed by Nikolas Zimmermann.

Add a toRenderSVGImage function
​https://bugs.webkit.org/show_bug.cgi?id=43789

Add a function for casting to RenderSVGImage and use it.

• rendering/RenderSVGImage.h: (WebCore::toRenderSVGImage):
• rendering/RenderTreeAsText.cpp: (WebCore::write):
• rendering/SVGRenderTreeAsText.cpp: (WebCore::writeSVGImage):
• rendering/SVGRenderTreeAsText.h:
• svg/SVGImageElement.cpp: (WebCore::SVGImageElement::attach):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderSVGImage.h (modified) (1 diff)
• rendering/RenderTreeAsText.cpp (modified) (1 diff)
• rendering/SVGRenderTreeAsText.cpp (modified) (2 diffs)
• rendering/SVGRenderTreeAsText.h (modified) (2 diffs)
• svg/SVGImageElement.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-10  Patrick Gansterer  <paroga@paroga.com>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Add a toRenderSVGImage function
+        https://bugs.webkit.org/show_bug.cgi?id=43789
+
+        Add a function for casting to RenderSVGImage and use it.
+
+        * rendering/RenderSVGImage.h:
+        (WebCore::toRenderSVGImage):
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::write):
+        * rendering/SVGRenderTreeAsText.cpp:
+        (WebCore::writeSVGImage):
+        * rendering/SVGRenderTreeAsText.h:
+        * svg/SVGImageElement.cpp:
+        (WebCore::SVGImageElement::attach):
+
 2010-08-10  Adam Barth  <abarth@webkit.org>
 

trunk/WebCore/rendering/RenderSVGImage.h

@@ -82 +82 @@
 };
 
+inline RenderSVGImage* toRenderSVGImage(RenderObject* object)
+{
+    ASSERT(!object || object->isSVGImage());
+    return static_cast<RenderSVGImage*>(object);
+}
+
+inline const RenderSVGImage* toRenderSVGImage(const RenderObject* object)
+{
+    ASSERT(!object || object->isSVGImage());
+    return static_cast<const RenderSVGImage*>(object);
+}
+
+// This will catch anyone doing an unnecessary cast.
+void toRenderSVGImage(const RenderSVGImage*);
+
 } // namespace WebCore
 

trunk/WebCore/rendering/RenderTreeAsText.cpp

@@ -443 +443 @@
     }
     if (o.isSVGImage()) {
-        writeSVGImage(ts, *toRenderImage(&o), indent);
+        writeSVGImage(ts, *toRenderSVGImage(&o), indent);
         return;
     }

trunk/WebCore/rendering/SVGRenderTreeAsText.cpp

@@ -44 +44 @@
 #include "RenderSVGContainer.h"
 #include "RenderSVGGradientStop.h"
+#include "RenderSVGImage.h"
 #include "RenderSVGInlineText.h"
 #include "RenderSVGResourceClipper.h"
@@ -709 +710 @@
 }
 
-void writeSVGImage(TextStream& ts, const RenderImage& image, int indent)
+void writeSVGImage(TextStream& ts, const RenderSVGImage& image, int indent)
 {
     writeStandardPrefix(ts, image, indent);

trunk/WebCore/rendering/SVGRenderTreeAsText.h

@@ -45 +45 @@
     class RenderPath;
     class RenderSVGGradientStop;
+    class RenderSVGImage;
     class RenderSVGRoot;
     class RenderText;
@@ -56 +57 @@
 void writeSVGResourceContainer(TextStream&, const RenderObject&, int indent);
 void writeSVGContainer(TextStream&, const RenderObject&, int indent);
-void writeSVGImage(TextStream&, const RenderImage&, int indent);
+void writeSVGImage(TextStream&, const RenderSVGImage&, int indent);
 void writeSVGInlineText(TextStream&, const RenderText&, int indent);
 void writeSVGText(TextStream&, const RenderBlock&, int indent);

trunk/WebCore/svg/SVGImageElement.cpp

@@ -172 +172 @@
     SVGStyledTransformableElement::attach();
 
-    if (RenderImage* imageObj = toRenderImage(renderer())) {
+    if (RenderSVGImage* imageObj = toRenderSVGImage(renderer())) {
         if (imageObj->hasImage())
             return;