Changeset 163316 in webkit

Timestamp:

Feb 3, 2014 10:52:12 AM (10 years ago)

Author:

akling@apple.com

Message:

CTTE: Grab bag of SVGRenderTreeAsText cleanups.
<​https://webkit.org/b/128099>

Made some of the DRT SVG functions take more specific types than
RenderObject. Removed some redundant casts.

Reviewed by Anders Carlsson.

• rendering/RenderTreeAsText.cpp:

(WebCore::write):

• rendering/svg/SVGRenderTreeAsText.h:
• rendering/svg/SVGRenderTreeAsText.cpp:

(WebCore::writeSVGResourceContainer):
(WebCore::writeSVGContainer):

Make writeSVGResourceContainer() and writeSVGContainer() take the
final type instead of RenderObject.

(WebCore::writeStyle):
(WebCore::writePositionAndStyle):

Make these take RenderElement instead of RenderObject.

(WebCore::writeChildren):

Use child renderer iterator.

(WebCore::writeResources):

Remove unnecessary cast.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-03  Andreas Kling  <akling@apple.com>
+
+        CTTE: Grab bag of SVGRenderTreeAsText cleanups.
+        <https://webkit.org/b/128099>
+
+        Made some of the DRT SVG functions take more specific types than
+        RenderObject. Removed some redundant casts.
+
+        Reviewed by Anders Carlsson.
+
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::write):
+        * rendering/svg/SVGRenderTreeAsText.h:
+        * rendering/svg/SVGRenderTreeAsText.cpp:
+        (WebCore::writeSVGResourceContainer):
+        (WebCore::writeSVGContainer):
+
+            Make writeSVGResourceContainer() and writeSVGContainer() take the
+            final type instead of RenderObject.
+
+        (WebCore::writeStyle):
+        (WebCore::writePositionAndStyle):
+
+            Make these take RenderElement instead of RenderObject.
+
+        (WebCore::writeChildren):
+
+            Use child renderer iterator.
+
+        (WebCore::writeResources):
+
+            Remove unnecessary cast.
+
 2014-01-25  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -67 +67 @@
 #include "RenderSVGInlineText.h"
 #include "RenderSVGPath.h"
+#include "RenderSVGResourceContainer.h"
 #include "RenderSVGRoot.h"
 #include "RenderSVGText.h"
@@ -519 +520 @@
     }
     if (o.isSVGResourceContainer()) {
-        writeSVGResourceContainer(ts, o, indent);
+        writeSVGResourceContainer(ts, toRenderSVGResourceContainer(o), indent);
         return;
     }
     if (o.isSVGContainer()) {
-        writeSVGContainer(ts, o, indent);
+        writeSVGContainer(ts, toRenderSVGContainer(o), indent);
         return;
     }

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

@@ -36 +36 @@
 #include "NodeRenderStyle.h"
 #include "RenderImage.h"
+#include "RenderIterator.h"
 #include "RenderSVGGradientStop.h"
 #include "RenderSVGImage.h"
@@ -251 +252 @@
 }
 
-static void writeStyle(TextStream& ts, const RenderObject& object)
-{
-    const RenderStyle& style = object.style();
+static void writeStyle(TextStream& ts, const RenderElement& renderer)
+{
+    const RenderStyle& style = renderer.style();
     const SVGRenderStyle& svgStyle = style.svgStyle();
 
-    if (!object.localTransform().isIdentity())
-        writeNameValuePair(ts, "transform", object.localTransform());
+    if (!renderer.localTransform().isIdentity())
+        writeNameValuePair(ts, "transform", renderer.localTransform());
     writeIfNotDefault(ts, "image rendering", style.imageRendering(), RenderStyle::initialImageRendering());
     writeIfNotDefault(ts, "opacity", style.opacity(), RenderStyle::initialOpacity());
-    if (object.isSVGShape()) {
-        const RenderSVGShape& shape = static_cast<const RenderSVGShape&>(object);
+    if (renderer.isSVGShape()) {
+        const auto& shape = toRenderSVGShape(renderer);
 
         Color fallbackColor;
@@ -308 +309 @@
 }
 
-static TextStream& writePositionAndStyle(TextStream& ts, const RenderObject& object)
-{
-    ts << " " << enclosingIntRect(const_cast<RenderObject&>(object).absoluteClippedOverflowRect());
-    writeStyle(ts, object);
+static TextStream& writePositionAndStyle(TextStream& ts, const RenderElement& renderer)
+{
+    ts << " " << enclosingIntRect(renderer.absoluteClippedOverflowRect());
+    writeStyle(ts, renderer);
     return ts;
 }
@@ -452 +453 @@
 }
 
-static void writeChildren(TextStream& ts, const RenderObject& object, int indent)
-{
-    for (RenderObject* child = object.firstChildSlow(); child; child = child->nextSibling())
-        write(ts, *child, indent + 1);
+static void writeChildren(TextStream& ts, const RenderElement& parent, int indent)
+{
+    for (const auto& child : childrenOfType<RenderObject>(parent))
+        write(ts, child, indent + 1);
 }
 
@@ -469 +470 @@
 }
 
-void writeSVGResourceContainer(TextStream& ts, const RenderObject& object, int indent)
-{
-    writeStandardPrefix(ts, object, indent);
-
-    Element* element = toElement(object.node());
-    const AtomicString& id = element->getIdAttribute();
+void writeSVGResourceContainer(TextStream& ts, const RenderSVGResourceContainer& resource, int indent)
+{
+    writeStandardPrefix(ts, resource, indent);
+
+    const AtomicString& id = resource.element().getIdAttribute();
     writeNameAndQuotedValue(ts, "id", id);    
-
-    const auto& resource = toRenderSVGResourceContainer(object);
 
     if (resource.resourceType() == MaskerResourceType) {
@@ -553 +551 @@
     } else
         ts << "\n";
-    writeChildren(ts, object, indent);
-}
-
-void writeSVGContainer(TextStream& ts, const RenderObject& container, int indent)
+    writeChildren(ts, resource, indent);
+}
+
+void writeSVGContainer(TextStream& ts, const RenderSVGContainer& container, int indent)
 {
     // Currently RenderSVGResourceFilterPrimitive has no meaningful output.
@@ -617 +615 @@
 }
 
-void writeResources(TextStream& ts, const RenderObject& object, int indent)
-{
-    const RenderStyle& style = object.style();
+void writeResources(TextStream& ts, const RenderObject& renderer, int indent)
+{
+    const RenderStyle& style = renderer.style();
     const SVGRenderStyle& svgStyle = style.svgStyle();
 
     // FIXME: We want to use SVGResourcesCache to determine which resources are present, instead of quering the resource <-> id cache.
     // For now leave the DRT output as is, but later on we should change this so cycles are properly ignored in the DRT output.
-    RenderObject& renderer = const_cast<RenderObject&>(object);
     if (!svgStyle.maskerResource().isEmpty()) {
-        if (RenderSVGResourceMasker* masker = getRenderSVGResourceById<RenderSVGResourceMasker>(object.document(), svgStyle.maskerResource())) {
+        if (RenderSVGResourceMasker* masker = getRenderSVGResourceById<RenderSVGResourceMasker>(renderer.document(), svgStyle.maskerResource())) {
             writeIndent(ts, indent);
             ts << " ";
@@ -636 +633 @@
     }
     if (!svgStyle.clipperResource().isEmpty()) {
-        if (RenderSVGResourceClipper* clipper = getRenderSVGResourceById<RenderSVGResourceClipper>(object.document(), svgStyle.clipperResource())) {
+        if (RenderSVGResourceClipper* clipper = getRenderSVGResourceById<RenderSVGResourceClipper>(renderer.document(), svgStyle.clipperResource())) {
             writeIndent(ts, indent);
             ts << " ";
@@ -647 +644 @@
 #if ENABLE(FILTERS)
     if (!svgStyle.filterResource().isEmpty()) {
-        if (RenderSVGResourceFilter* filter = getRenderSVGResourceById<RenderSVGResourceFilter>(object.document(), svgStyle.filterResource())) {
+        if (RenderSVGResourceFilter* filter = getRenderSVGResourceById<RenderSVGResourceFilter>(renderer.document(), svgStyle.filterResource())) {
             writeIndent(ts, indent);
             ts << " ";

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

@@ -39 +39 @@
 class RenderImage;
 class RenderObject;
+class RenderSVGContainer;
 class RenderSVGGradientStop;
 class RenderSVGImage;
 class RenderSVGInlineText;
+class RenderSVGResourceContainer;
 class RenderSVGShape;
 class RenderSVGRoot;
@@ -52 +54 @@
 void write(TextStream&, const RenderSVGRoot&, int indent);
 void writeSVGGradientStop(TextStream&, const RenderSVGGradientStop&, int indent);
-void writeSVGResourceContainer(TextStream&, const RenderObject&, int indent);
-void writeSVGContainer(TextStream&, const RenderObject&, int indent);
+void writeSVGResourceContainer(TextStream&, const RenderSVGResourceContainer&, int indent);
+void writeSVGContainer(TextStream&, const RenderSVGContainer&, int indent);
 void writeSVGImage(TextStream&, const RenderSVGImage&, int indent);
 void writeSVGInlineText(TextStream&, const RenderSVGInlineText&, int indent);