Changeset 106336 in webkit

Timestamp:

Jan 30, 2012 10:36:02 PM (12 years ago)

Author:

hayato@chromium.org

Message:

Attach light children after removing a shadow root.
​https://bugs.webkit.org/show_bug.cgi?id=74267

Reviewed by Ryosuke Niwa.

Source/WebCore:

Tests: fast/dom/shadow/dynamically-created-shadow-root-expected.html

fast/dom/shadow/dynamically-created-shadow-root.html:

• dom/Element.cpp:

(WebCore::Element::removeShadowRoot):

LayoutTests:

• fast/dom/shadow/dynamically-created-shadow-root-expected.html:
• fast/dom/shadow/dynamically-created-shadow-root.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/dynamically-created-shadow-root-expected.html (modified) (1 diff)
• LayoutTests/fast/dom/shadow/dynamically-created-shadow-root.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-30  Hayato Ito  <hayato@chromium.org>
+
+        Attach light children after removing a shadow root.
+        https://bugs.webkit.org/show_bug.cgi?id=74267
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/dom/shadow/dynamically-created-shadow-root-expected.html:
+        * fast/dom/shadow/dynamically-created-shadow-root.html:
+
 2012-01-30  Raymond Liu  <raymond.liu@intel.com>
 

trunk/LayoutTests/fast/dom/shadow/dynamically-created-shadow-root-expected.html

@@ -6 +6 @@
 </div>
 <div>Shadow should be rendered.</div>
+<div>Light children should be rendered after a shadow root is removed.</div>
 </body>
 </html>

trunk/LayoutTests/fast/dom/shadow/dynamically-created-shadow-root.html

@@ -5 +5 @@
 Can only run within DRT.
 </div>
-<div id="host">Light children should not be rendered.</div>
+<div id="host1">Light children should not be rendered.</div>
+<div id="host2">Light children should be rendered after a shadow root is removed.</div>
 <script>
 if (window.internals) {
-    var host = document.querySelector('#host');
-    var shadowRoot = window.internals.ensureShadowRoot(host);
+    var host1 = document.querySelector('#host1');
+    var shadowRoot = window.internals.ensureShadowRoot(host1);
     shadowRoot.appendChild(document.createTextNode('Shadow should be rendered.'));
+
+    var host2 = document.querySelector('#host2');
+    var shadowRoot = window.internals.ensureShadowRoot(host2);
+    shadowRoot.appendChild(document.createTextNode('Shadow should not be rendered.'));
+    window.internals.removeShadowRoot(host2);
 }
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-30  Hayato Ito  <hayato@chromium.org>
+
+        Attach light children after removing a shadow root.
+        https://bugs.webkit.org/show_bug.cgi?id=74267
+
+        Reviewed by Ryosuke Niwa.
+
+        Tests: fast/dom/shadow/dynamically-created-shadow-root-expected.html
+               fast/dom/shadow/dynamically-created-shadow-root.html:
+
+        * dom/Element.cpp:
+        (WebCore::Element::removeShadowRoot):
+
 2012-01-30  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1221 +1221 @@
         else
             oldRoot->removedFromTree(true);
+        if (attached()) {
+            for (Node* child = firstChild(); child; child = child->nextSibling())
+                if (!child->attached())
+                    child->lazyAttach();
+        }
     }
 }