Changeset 107050 in webkit

Timestamp:

Feb 8, 2012 12:57:08 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Stop calling Element::ensureShadowRoot() if it is used in construction phase.
​https://bugs.webkit.org/show_bug.cgi?id=77929

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

ShadowRoot's life cycle can be consufing If Element::ensureShadowRoot() is used.
So we want to remove Element::ensureShadowRoot().
This patch replaces Element::ensureShadowRoot() if it is used in object construction phase.

No new tests, no change in behavior.

• html/HTMLDetailsElement.cpp:

(WebCore::HTMLDetailsElement::createShadowSubtree):

• html/HTMLKeygenElement.cpp:

(WebCore::HTMLKeygenElement::HTMLKeygenElement):

• html/HTMLMeterElement.cpp:

(WebCore::HTMLMeterElement::createShadowSubtree):

• html/HTMLProgressElement.cpp:

(WebCore::HTMLProgressElement::createShadowSubtree):

• html/HTMLSummaryElement.cpp:

(WebCore::HTMLSummaryElement::createShadowSubtree):

• html/HTMLTextAreaElement.cpp:

(WebCore::HTMLTextAreaElement::createShadowSubtree):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLDetailsElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLKeygenElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLMeterElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLProgressElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLSummaryElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLTextAreaElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-08  Shinya Kawanaka  <shinyak@google.com>
+
+        Stop calling Element::ensureShadowRoot() if it is used in construction phase.
+        https://bugs.webkit.org/show_bug.cgi?id=77929
+
+        Reviewed by Hajime Morita.
+
+        ShadowRoot's life cycle can be consufing If Element::ensureShadowRoot() is used.
+        So we want to remove Element::ensureShadowRoot().
+        This patch replaces Element::ensureShadowRoot() if it is used in object construction phase.
+
+        No new tests, no change in behavior.
+
+        * html/HTMLDetailsElement.cpp:
+        (WebCore::HTMLDetailsElement::createShadowSubtree):
+        * html/HTMLKeygenElement.cpp:
+        (WebCore::HTMLKeygenElement::HTMLKeygenElement):
+        * html/HTMLMeterElement.cpp:
+        (WebCore::HTMLMeterElement::createShadowSubtree):
+        * html/HTMLProgressElement.cpp:
+        (WebCore::HTMLProgressElement::createShadowSubtree):
+        * html/HTMLSummaryElement.cpp:
+        (WebCore::HTMLSummaryElement::createShadowSubtree):
+        * html/HTMLTextAreaElement.cpp:
+        (WebCore::HTMLTextAreaElement::createShadowSubtree):
+
 2012-02-08  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/html/HTMLDetailsElement.cpp

@@ -110 +110 @@
 {
     ASSERT(!shadowRoot());
-    ensureShadowRoot()->appendChild(DetailsSummaryElement::create(document()), ASSERT_NO_EXCEPTION, true);
-    ensureShadowRoot()->appendChild(DetailsContentElement::create(document()), ASSERT_NO_EXCEPTION, true);
+
+    RefPtr<ShadowRoot> root = ShadowRoot::create(this, ASSERT_NO_EXCEPTION);
+    root->appendChild(DetailsSummaryElement::create(document()), ASSERT_NO_EXCEPTION, true);
+    root->appendChild(DetailsContentElement::create(document()), ASSERT_NO_EXCEPTION, true);
 }
 

trunk/Source/WebCore/html/HTMLKeygenElement.cpp

@@ -86 +86 @@
     }
 
-    ensureShadowRoot()->appendChild(select, ec);
+    ASSERT(!shadowRoot());
+    RefPtr<ShadowRoot> root = ShadowRoot::create(this, ASSERT_NO_EXCEPTION);
+    root->appendChild(select, ec);
 }
 

trunk/Source/WebCore/html/HTMLMeterElement.cpp

@@ -235 +235 @@
 void HTMLMeterElement::createShadowSubtree()
 {
+    ASSERT(!shadowRoot());
+
     RefPtr<MeterBarElement> bar = MeterBarElement::create(document());
     m_value = MeterValueElement::create(document());
     ExceptionCode ec = 0;
     bar->appendChild(m_value, ec);
-    ensureShadowRoot()->appendChild(bar, ec);
+
+    RefPtr<ShadowRoot> root = ShadowRoot::create(this, ASSERT_NO_EXCEPTION);
+    root->appendChild(bar, ec);
 }
 

trunk/Source/WebCore/html/HTMLProgressElement.cpp

@@ -154 +154 @@
 void HTMLProgressElement::createShadowSubtree()
 {
+    ASSERT(!shadowRoot());
+
     RefPtr<ProgressBarElement> bar = ProgressBarElement::create(document());
     m_value = ProgressValueElement::create(document());
-    ExceptionCode ec = 0;
-    bar->appendChild(m_value, ec);
-    ensureShadowRoot()->appendChild(bar, ec);
+    bar->appendChild(m_value, ASSERT_NO_EXCEPTION);
+
+    RefPtr<ShadowRoot> root = ShadowRoot::create(this, ASSERT_NO_EXCEPTION);
+    root->appendChild(bar, ASSERT_NO_EXCEPTION);
 }
 

trunk/Source/WebCore/html/HTMLSummaryElement.cpp

@@ -74 +74 @@
 void HTMLSummaryElement::createShadowSubtree()
 {
-    ExceptionCode ec = 0;
-    ensureShadowRoot()->appendChild(DetailsMarkerControl::create(document()), ec, true);
-    ensureShadowRoot()->appendChild(SummaryContentElement::create(document()), ec, true);
+    ASSERT(!shadowRoot());
+    RefPtr<ShadowRoot> root = ShadowRoot::create(this, ASSERT_NO_EXCEPTION);
+    root->appendChild(DetailsMarkerControl::create(document()), ASSERT_NO_EXCEPTION, true);
+    root->appendChild(SummaryContentElement::create(document()), ASSERT_NO_EXCEPTION, true);
 }
 

trunk/Source/WebCore/html/HTMLTextAreaElement.cpp

@@ -85 +85 @@
 void HTMLTextAreaElement::createShadowSubtree()
 {
-    ExceptionCode ec = 0;
-    ensureShadowRoot()->appendChild(TextControlInnerTextElement::create(document()), ec);
+    ASSERT(!shadowRoot());
+    RefPtr<ShadowRoot> root = ShadowRoot::create(this, ASSERT_NO_EXCEPTION);
+    root->appendChild(TextControlInnerTextElement::create(document()), ASSERT_NO_EXCEPTION);
 }