Changeset 28559 in webkit

Timestamp:

Dec 8, 2007 12:53:33 AM (16 years ago)

Author:

rwlbuis@webkit.org

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=15528
svg_dynamic_cast should be removed

Replace svg_dynamic_cast with a combination of
isSVGElement and static_cast.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SVGRootInlineBox.cpp (modified) (2 diffs)
• svg/SVGAnimationElement.cpp (modified) (2 diffs)
• svg/SVGElement.h (modified) (1 diff)
• svg/SVGElementInstance.cpp (modified) (1 diff)
• svg/SVGFilterElement.cpp (modified) (1 diff)
• svg/SVGGradientElement.cpp (modified) (1 diff)
• svg/SVGLocatable.cpp (modified) (1 diff)
• svg/SVGMaskElement.cpp (modified) (1 diff)
• svg/SVGSwitchElement.cpp (modified) (1 diff)
• svg/SVGUseElement.cpp (modified) (8 diffs)
• svg/graphics/SVGResource.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-12-08  Rob Buis  <buis@kde.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=15528
+        svg_dynamic_cast should be removed
+
+        Replace svg_dynamic_cast with a combination of
+        isSVGElement and static_cast.
+
+        * rendering/SVGRootInlineBox.cpp:
+        (WebCore::SVGRootInlineBox::buildLayoutInformation):
+        (WebCore::SVGRootInlineBox::buildTextChunks):
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::targetElement):
+        * svg/SVGElement.h:
+        * svg/SVGElementInstance.cpp:
+        (WebCore::SVGElementInstance::updateInstance):
+        * svg/SVGFilterElement.cpp:
+        (WebCore::SVGFilterElement::canvasResource):
+        * svg/SVGGradientElement.cpp:
+        (WebCore::SVGGradientElement::buildStops):
+        * svg/SVGLocatable.cpp:
+        (WebCore::SVGLocatable::getTransformToElement):
+        * svg/SVGMaskElement.cpp:
+        (WebCore::SVGMaskElement::drawMaskerContent):
+        * svg/SVGSwitchElement.cpp:
+        (WebCore::SVGSwitchElement::childShouldCreateRenderer):
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::insertedIntoDocument):
+        (WebCore::SVGUseElement::buildPendingResource):
+        (WebCore::SVGUseElement::buildInstanceTree):
+        (WebCore::SVGUseElement::handleDeepUseReferencing):
+        (WebCore::SVGUseElement::buildShadowTree):
+        (WebCore::SVGUseElement::expandUseElementsInShadowTree):
+        (WebCore::SVGUseElement::associateInstancesWithShadowTreeElements):
+        * svg/graphics/SVGResource.cpp:
+        (WebCore::getResourceById):
+
 2007-12-07  Antti Koivisto  <antti@apple.com>
 

trunk/WebCore/rendering/SVGRootInlineBox.cpp

@@ -914 +914 @@
 
                 // Handle text-anchor/textLength on path, which is special.
-                SVGElement* textElement = svg_dynamic_cast(flowBox->object()->element());
-                ASSERT(textElement);
-
-                SVGTextContentElement* textContent = static_cast<SVGTextContentElement*>(textElement);
+                SVGTextContentElement* textContent = 0;
+                Node* node = flowBox->object()->element();
+                if (node && node->isSVGElement())
+                    textContent = static_cast<SVGTextContentElement*>(node);
                 ASSERT(textContent);
 
@@ -1329 +1329 @@
             RenderText* text = textBox->textObject();
             ASSERT(text);
-
-            SVGElement* textElement = svg_dynamic_cast(text->element()->parent());
             ASSERT(text->element());
 
-            SVGTextContentElement* textContent = static_cast<SVGTextContentElement*>(textElement);
+            SVGTextContentElement* textContent = 0;
+            Node* node = text->element()->parent();
+            if (node && node->isSVGElement())
+                textContent = static_cast<SVGTextContentElement*>(node);
             ASSERT(textContent);
-            
+
             // Start new character range for the first chunk
             bool isFirstCharacter = info.svgTextChunks.isEmpty() && info.chunk.start == info.it && info.chunk.start == info.chunk.end;

trunk/WebCore/svg/SVGAnimationElement.cpp

@@ -79 +79 @@
 {
     if (!m_targetElement) {
+        Node *target = 0;
         if (!m_href.isEmpty()) {
-            Element* element = ownerDocument()->getElementById(SVGURIReference::getTarget(m_href));
-            m_targetElement = svg_dynamic_cast(element);
+            target = document()->getElementById(SVGURIReference::getTarget(m_href));
         } else if (parentNode()) {
-            Node* target = parentNode();
+            // TODO : do we really need to skip non element nodes? Can that happen at all?
+            target = parentNode();
             while (target) {
                 if (target->nodeType() != ELEMENT_NODE)
@@ -90 +91 @@
                     break;
             }
-            m_targetElement = svg_dynamic_cast(target);
         }
-    }
-                        
+        if (target && target->isSVGElement())
+            m_targetElement = static_cast<SVGElement*>(target);
+    }
+ 
     return m_targetElement;
 }

trunk/WebCore/svg/SVGElement.h

@@ -245 +245 @@
     };
 
-    static inline SVGElement* svg_dynamic_cast(Node* node)
-    {
-        SVGElement* svgElement = 0;
-        if (node && node->isSVGElement())
-            svgElement = static_cast<SVGElement*>(node);
-        return svgElement;
-    }
-
 } // namespace WebCore 
 

trunk/WebCore/svg/SVGElementInstance.cpp

@@ -163 +163 @@
     // For all other nodes this logic is sufficient.
     RefPtr<Node> clone = m_element->cloneNode(true);
-    SVGElement* svgClone = svg_dynamic_cast(clone.get());
+    SVGElement* svgClone = 0;
+    if (clone && clone->isSVGElement())
+        svgClone = static_cast<SVGElement*>(clone.get());
     ASSERT(svgClone);
 

trunk/WebCore/svg/SVGFilterElement.cpp

@@ -142 +142 @@
     m_filter->clearEffects();
     for (Node* n = firstChild(); n != 0; n = n->nextSibling()) {
-        SVGElement* element = svg_dynamic_cast(n);
+        SVGElement* element = 0;
+        if (n->isSVGElement())
+            element = static_cast<SVGElement*>(n);
         if (element && element->isFilterEffect()) {
             SVGFilterPrimitiveStandardAttributes* filterAttributes = static_cast<SVGFilterPrimitiveStandardAttributes*>(element);

trunk/WebCore/svg/SVGGradientElement.cpp

@@ -120 +120 @@
     RenderStyle* gradientStyle = 0;
     for (Node* n = firstChild(); n; n = n->nextSibling()) {
-        SVGElement* element = svg_dynamic_cast(n);
+        SVGElement* element = 0;
+        if (n->isSVGElement())
+            element = static_cast<SVGElement*>(n);
         if (element && element->isGradientStop()) {
             SVGStopElement* stop = static_cast<SVGStopElement*>(element);

trunk/WebCore/svg/SVGLocatable.cpp

@@ -132 +132 @@
     AffineTransform ctm = getCTM();
 
-    SVGElement* targetElement = svg_dynamic_cast(target);
-    if (targetElement && targetElement->isStyledLocatable()) {
-        AffineTransform targetCTM = static_cast<SVGStyledLocatableElement*>(targetElement)->getCTM();
+    if (target && target->isStyledLocatable()) {
+        AffineTransform targetCTM = static_cast<SVGStyledLocatableElement*>(target)->getCTM();
         if (!targetCTM.isInvertible()) {
             ec = SVG_MATRIX_NOT_INVERTABLE;

trunk/WebCore/svg/SVGMaskElement.cpp

@@ -160 +160 @@
     // Render subtree into ImageBuffer
     for (Node* n = firstChild(); n; n = n->nextSibling()) {
-        SVGElement* elem = svg_dynamic_cast(n);
+        SVGElement* elem = 0;
+        if (n->isSVGElement())
+            elem = static_cast<SVGElement*>(n);
         if (!elem || !elem->isStyled())
             continue;

trunk/WebCore/svg/SVGSwitchElement.cpp

@@ -45 +45 @@
 {
     for (Node* n = firstChild(); n != 0; n = n->nextSibling()) {
-        SVGElement* element = svg_dynamic_cast(n);
-        if (element && element->isValid())
-            return (n == child); // Only allow this child if it's the first valid child
+        if (n->isSVGElement()) {
+            SVGElement* element = static_cast<SVGElement*>(n);
+            if (element && element->isValid())
+                return (n == child); // Only allow this child if it's the first valid child
+        }
     }
 

trunk/WebCore/svg/SVGUseElement.cpp

@@ -117 +117 @@
 
     String id = SVGURIReference::getTarget(href());
-    Element* targetElement = ownerDocument()->getElementById(id);
+    Element* targetElement = document()->getElementById(id);
     if (!targetElement) {
         document()->accessSVGExtensions()->addPendingResource(id, this);
@@ -259 +259 @@
 
     String id = SVGURIReference::getTarget(href());
-    Element* targetElement = ownerDocument()->getElementById(id); 
-    SVGElement* target = svg_dynamic_cast(targetElement);
+    Element* targetElement = document()->getElementById(id); 
+    SVGElement* target = 0;
+    if (targetElement && targetElement->isSVGElement())
+        target = static_cast<SVGElement*>(targetElement);
 
     // Do not allow self-referencing.
@@ -389 +391 @@
 
     for (Node* node = target->firstChild(); node; node = node->nextSibling()) {
-        SVGElement* element = svg_dynamic_cast(node);
+        SVGElement* element = 0;
+        if (node->isSVGElement())
+            element = static_cast<SVGElement*>(node);
 
         // Skip any non-svg nodes or any disallowed element.
@@ -420 +424 @@
 {
     String id = SVGURIReference::getTarget(use->href());
-    Element* targetElement = ownerDocument()->getElementById(id); 
-    SVGElement* target = svg_dynamic_cast(targetElement);
+    Element* targetElement = document()->getElementById(id); 
+    SVGElement* target = 0;
+    if (targetElement && targetElement->isSVGElement())
+        target = static_cast<SVGElement*>(targetElement);
 
     if (!target)
@@ -499 +505 @@
         removeDisallowedElementsFromSubtree(newChild.get());
 
-    SVGElement* newChildPtr = svg_dynamic_cast(newChild.get());
+    SVGElement* newChildPtr = 0;
+    if (newChild->isSVGElement())
+        newChildPtr = static_cast<SVGElement*>(newChild.get());
     ASSERT(newChildPtr);
 
@@ -525 +533 @@
 
         String id = SVGURIReference::getTarget(use->href());
-        Element* targetElement = ownerDocument()->getElementById(id); 
-        SVGElement* target = svg_dynamic_cast(targetElement);
+        Element* targetElement = document()->getElementById(id); 
+        SVGElement* target = 0;
+        if (targetElement && targetElement->isSVGElement())
+            target = static_cast<SVGElement*>(targetElement);
 
         // Don't ASSERT(target) here, it may be "pending", too.
@@ -574 +584 @@
                 removeDisallowedElementsFromSubtree(newChild.get());
 
-            SVGElement* newChildPtr = svg_dynamic_cast(newChild.get());
+            SVGElement* newChildPtr = 0;
+            if (newChild->isSVGElement())
+                newChildPtr = static_cast<SVGElement*>(newChild.get());
             ASSERT(newChildPtr);
 
@@ -699 +711 @@
         ASSERT(target->nodeName() == originalElement->nodeName());
 
-    SVGElement* element = svg_dynamic_cast(target);
+    SVGElement* element = 0;
+    if (target->isSVGElement())
+        element = static_cast<SVGElement*>(target);
 
     ASSERT(!targetInstance->shadowTreeElement());

trunk/WebCore/svg/graphics/SVGResource.cpp

@@ -159 +159 @@
 
     Element* element = document->getElementById(id);
-    SVGElement* svgElement = svg_dynamic_cast(element);
+    SVGElement* svgElement = 0;
+    if (element && element->isSVGElement())
+        svgElement = static_cast<SVGElement*>(element);
 
     if (svgElement && svgElement->isStyled())