Changeset 31859 in webkit

Timestamp:

Apr 13, 2008 11:53:48 PM (16 years ago)

Author:

rwlbuis@webkit.org

Message:

Reviewed by Eric.

​http://bugs.webkit.org/show_bug.cgi?id=18230
tspan in link not working

Implement SVG Errata: "The 'a' element may contain any
element that its parent may contain, except itself."

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/svg/custom/text-linking-expected.txt (added)
• LayoutTests/svg/custom/text-linking.svg (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGAElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-04-14  Rob Buis  <buis@kde.org>
+
+        Reviewed by Eric.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=18230
+        tspan in link not working
+
+        * platform/mac/svg/custom/text-linking-expected.txt: Added.
+        * svg/custom/text-linking.svg: Added.
+
 2008-04-11  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-14  Rob Buis  <buis@kde.org>
+
+        Reviewed by Eric.
+
+        http://bugs.webkit.org/show_bug.cgi?id=18230
+        tspan in link not working
+
+        Implement SVG Errata: "The 'a' element may contain any
+        element that its parent may contain, except itself."
+
+        * svg/SVGAElement.cpp:
+        (WebCore::SVGAElement::childShouldCreateRenderer):
+
 2008-04-13  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/svg/SVGAElement.cpp

@@ -202 +202 @@
 bool SVGAElement::childShouldCreateRenderer(Node* child) const
 {
-    if (static_cast<SVGElement*>(parent())->isTextContent())
-        return child->isTextNode();
+    // http://www.w3.org/2003/01/REC-SVG11-20030114-errata#linking-text-environment
+    // The 'a' element may contain any element that its parent may contain, except itself.
+    if (child->hasTagName(SVGNames::aTag))
+        return false;
+    if (parent() && parent()->isSVGElement())
+        return static_cast<SVGElement*>(parent())->childShouldCreateRenderer(child);
 
     return SVGElement::childShouldCreateRenderer(child);