Changeset 87029 in webkit

Timestamp:

May 22, 2011 8:56:02 AM (13 years ago)

Author:

dominicc@chromium.org

Message:

2011-05-22 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Dimitri Glazkov.

When removing a shadow root, also remove it from the render tree.
​https://bugs.webkit.org/show_bug.cgi?id=61245

• platform/mac/Skipped: Unskip shadow tests.

2011-05-22 Dominic Cooney <​dominicc@chromium.org>

Reviewed by Dimitri Glazkov.

When removing a shadow root, also remove it from the render tree.
​https://bugs.webkit.org/show_bug.cgi?id=61245

Test: existing fast/dom/shadow/layout-tests-can-access-shadow.html

• dom/Element.cpp: (WebCore::Element::removeShadowRoot): Call detach if attached.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-22  Dominic Cooney  <dominicc@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        When removing a shadow root, also remove it from the render tree.
+        https://bugs.webkit.org/show_bug.cgi?id=61245
+
+        * platform/mac/Skipped: Unskip shadow tests.
+
 2011-05-21  Dirk Schulze  <krit@webkit.org>
 

trunk/LayoutTests/platform/mac/Skipped

@@ -345 +345 @@
 plugins/mouse-click-iframe-to-plugin.html
 
-# Unskip when https://bugs.webkit.org/show_bug.cgi?id=59571 is fixed
-fast/dom/shadow
-
 # Animation API is disabled by default
 animations/animation-api-1.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-22  Dominic Cooney  <dominicc@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        When removing a shadow root, also remove it from the render tree.
+        https://bugs.webkit.org/show_bug.cgi?id=61245
+
+        Test: existing fast/dom/shadow/layout-tests-can-access-shadow.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::removeShadowRoot): Call detach if attached.
+
 2011-05-22  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1203 +1203 @@
         data->m_shadowRoot = 0;
         document()->removeFocusedNodeOfSubtree(oldRoot.get());
+
+        // Remove from rendering tree
+        if (oldRoot->attached())
+            oldRoot->detach();
+
         oldRoot->setShadowHost(0);
+
         if (oldRoot->inDocument())
             oldRoot->removedFromDocument();