Changeset 68867 in webkit

Timestamp:

Oct 1, 2010 12:16:23 AM (14 years ago)

Author:

Nikolas Zimmermann

Message:

2010-10-01 Nikolas Zimmermann <​nzimmermann@rim.com>

Reviewed by Dirk Schulze.

Add helper methods to cast between renderers & SVGTextContent/PositioningElement
​https://bugs.webkit.org/show_bug.cgi?id=46963

Doesn't affect any tests.

• svg/SVGTextContentElement.cpp: (WebCore::SVGTextContentElement::elementFromRenderer):
• svg/SVGTextContentElement.h:
• svg/SVGTextPositioningElement.cpp: (WebCore::SVGTextPositioningElement::elementFromRenderer):
• svg/SVGTextPositioningElement.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGTextContentElement.cpp (modified) (2 diffs)
• svg/SVGTextContentElement.h (modified) (1 diff)
• svg/SVGTextPositioningElement.cpp (modified) (1 diff)
• svg/SVGTextPositioningElement.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-01  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        Add helper methods to cast between renderers & SVGTextContent/PositioningElement
+        https://bugs.webkit.org/show_bug.cgi?id=46963
+
+        Doesn't affect any tests.
+
+        * svg/SVGTextContentElement.cpp:
+        (WebCore::SVGTextContentElement::elementFromRenderer):
+        * svg/SVGTextContentElement.h:
+        * svg/SVGTextPositioningElement.cpp:
+        (WebCore::SVGTextPositioningElement::elementFromRenderer):
+        * svg/SVGTextPositioningElement.h:
+
 2010-09-30  MORITA Hajime  <morrita@google.com>
 

trunk/WebCore/svg/SVGTextContentElement.cpp

@@ -27 +27 @@
 #include "CSSValueKeywords.h"
 #include "Frame.h"
+#include "RenderObject.h"
 #include "SVGTextQuery.h"
 #include "SelectionController.h"
@@ -216 +217 @@
 }
 
+SVGTextContentElement* SVGTextContentElement::elementFromRenderer(RenderObject* renderer)
+{
+    if (!renderer)
+        return 0;
+
+    if (!renderer->isSVGText() && !renderer->isSVGInline())
+        return 0;
+
+    Node* node = renderer->node();
+    ASSERT(node);
+    ASSERT(node->isSVGElement());
+
+    if (!node->hasTagName(SVGNames::textTag)
+        && !node->hasTagName(SVGNames::tspanTag)
+#if ENABLE(SVG_FONTS)
+        && !node->hasTagName(SVGNames::altGlyphTag)
+#endif
+        && !node->hasTagName(SVGNames::trefTag)
+        && !node->hasTagName(SVGNames::textPathTag))
+        return 0;
+
+    return static_cast<SVGTextContentElement*>(node);
+}
+
 }
 

trunk/WebCore/svg/SVGTextContentElement.h

@@ -55 +55 @@
         bool isKnownAttribute(const QualifiedName&);
 
+        static SVGTextContentElement* elementFromRenderer(RenderObject*);
+
     protected:
         SVGTextContentElement(const QualifiedName&, Document*);

trunk/WebCore/svg/SVGTextPositioningElement.cpp

@@ -144 +144 @@
 }
 
+SVGTextPositioningElement* SVGTextPositioningElement::elementFromRenderer(RenderObject* renderer)
+{
+    if (!renderer)
+        return 0;
+
+    if (!renderer->isSVGText() && !renderer->isSVGInline())
+        return 0;
+
+    Node* node = renderer->node();
+    ASSERT(node);
+    ASSERT(node->isSVGElement());
+
+    if (!node->hasTagName(SVGNames::textTag)
+        && !node->hasTagName(SVGNames::tspanTag)
+#if ENABLE(SVG_FONTS)
+        && !node->hasTagName(SVGNames::altGlyphTag)
+#endif
+        && !node->hasTagName(SVGNames::trefTag))
+        return 0;
+
+    return static_cast<SVGTextPositioningElement*>(node);
+}
+
+
 }
 

trunk/WebCore/svg/SVGTextPositioningElement.h

@@ -30 +30 @@
 
     class SVGTextPositioningElement : public SVGTextContentElement {
+    public:
+        static SVGTextPositioningElement* elementFromRenderer(RenderObject*);
+
     protected:
         SVGTextPositioningElement(const QualifiedName&, Document*);