Changeset 107523 in webkit

Timestamp:

Feb 12, 2012 7:35:19 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

SVGTRefElement shouldn't create a shadow root dynamically.
​https://bugs.webkit.org/show_bug.cgi?id=77938

Patch by Shinya Kawanaka <​shinyak@google.com> on 2012-02-12
Reviewed by Hajime Morita.

Source/WebCore:

SVGTRefElement creates a shadow root dynamically. This will cause a problem to support
multiple shadow subtrees. So it should be created in a constructor phase.

Test: svg/custom/tref-shadowdom.html

• svg/SVGTRefElement.cpp:

(WebCore::SVGTRefElement::create):
(WebCore::SVGTRefElement::createShadowSubtree):
(WebCore):
(WebCore::SVGTRefElement::updateReferencedText):

• svg/SVGTRefElement.h:

(SVGTRefElement):

LayoutTests:

Checks a shadow root exists of tref element in cases xlink:href is set and is not set.

• svg/custom/tref-shadowdom-expected.txt: Added.
• svg/custom/tref-shadowdom.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/custom/tref-shadowdom-expected.txt (added)
• LayoutTests/svg/custom/tref-shadowdom.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGTRefElement.cpp (modified) (3 diffs)
• Source/WebCore/svg/SVGTRefElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-12  Shinya Kawanaka  <shinyak@google.com>
+
+        SVGTRefElement shouldn't create a shadow root dynamically.
+        https://bugs.webkit.org/show_bug.cgi?id=77938
+
+        Reviewed by Hajime Morita.
+
+        Checks a shadow root exists of tref element in cases xlink:href is set and is not set.
+
+        * svg/custom/tref-shadowdom-expected.txt: Added.
+        * svg/custom/tref-shadowdom.html: Added.
+
 2012-02-12  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-12  Shinya Kawanaka  <shinyak@google.com>
+
+        SVGTRefElement shouldn't create a shadow root dynamically.
+        https://bugs.webkit.org/show_bug.cgi?id=77938
+
+        Reviewed by Hajime Morita.
+
+        SVGTRefElement creates a shadow root dynamically. This will cause a problem to support
+        multiple shadow subtrees. So it should be created in a constructor phase.
+
+        Test: svg/custom/tref-shadowdom.html
+
+        * svg/SVGTRefElement.cpp:
+        (WebCore::SVGTRefElement::create):
+        (WebCore::SVGTRefElement::createShadowSubtree):
+        (WebCore):
+        (WebCore::SVGTRefElement::updateReferencedText):
+        * svg/SVGTRefElement.h:
+        (SVGTRefElement):
+
 2012-02-12  Kentaro Hara  <haraken@chromium.org>
 

trunk/Source/WebCore/svg/SVGTRefElement.cpp

@@ -57 +57 @@
 PassRefPtr<SVGTRefElement> SVGTRefElement::create(const QualifiedName& tagName, Document* document)
 {
-    return adoptRef(new SVGTRefElement(tagName, document));
+    RefPtr<SVGTRefElement> element = adoptRef(new SVGTRefElement(tagName, document));
+    element->createShadowSubtree();
+    return element.release();
 }
 
@@ -145 +147 @@
 }
 
+void SVGTRefElement::createShadowSubtree()
+{
+    ShadowRoot::create(this, ShadowRoot::CreatingUserAgentShadowRoot, ASSERT_NO_EXCEPTION);
+}
+
 void SVGTRefElement::updateReferencedText()
 {
@@ -152 +159 @@
     if (target->parentNode())
         textContent = target->textContent();
-    ExceptionCode ignore = 0;
-    if (!ensureShadowRoot()->firstChild())
-        shadowRoot()->appendChild(SVGShadowText::create(document(), textContent), ignore);
+
+    if (!shadowRoot()->firstChild())
+        shadowRoot()->appendChild(SVGShadowText::create(document(), textContent), ASSERT_NO_EXCEPTION);
     else
-        shadowRoot()->firstChild()->setTextContent(textContent, ignore);
+        shadowRoot()->firstChild()->setTextContent(textContent, ASSERT_NO_EXCEPTION);
 }
 

trunk/Source/WebCore/svg/SVGTRefElement.h

@@ -41 +41 @@
     virtual ~SVGTRefElement();
 
+    void createShadowSubtree();
+
     bool isSupportedAttribute(const QualifiedName&);
     virtual void parseAttribute(Attribute*) OVERRIDE;