Changeset 154746 in webkit

Timestamp:

Aug 28, 2013, 7:41:12 AM (12 years ago)

Author:

Antti Koivisto

Message:

Share attach loops between Elements and ShadowRoots
​https://bugs.webkit.org/show_bug.cgi?id=120414

Reviewed Andreas Kling.

• style/StyleResolveTree.cpp:

(WebCore::Style::attachChildren):
(WebCore::Style::attachShadowRoot):
(WebCore::Style::detachChildren):
(WebCore::Style::detachShadowRoot):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• style/StyleResolveTree.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-28  Antti Koivisto  <antti@apple.com>
+
+        Share attach loops between Elements and ShadowRoots
+        https://bugs.webkit.org/show_bug.cgi?id=120414
+
+        Reviewed Andreas Kling.
+
+        * style/StyleResolveTree.cpp:
+        (WebCore::Style::attachChildren):
+        (WebCore::Style::attachShadowRoot):
+        (WebCore::Style::detachChildren):
+        (WebCore::Style::detachShadowRoot):
+
 2013-08-28  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -288 +288 @@
 }
 
-
-static void attachShadowRoot(ShadowRoot* shadowRoot, const AttachContext& context)
-{
-    if (shadowRoot->attached())
-        return;
-    StyleResolver& styleResolver = shadowRoot->document()->ensureStyleResolver();
-    styleResolver.pushParentShadowRoot(shadowRoot);
-
-    Style::AttachContext childrenContext(context);
-    childrenContext.resolvedStyle = 0;
-    for (Node* child = shadowRoot->firstChild(); child; child = child->nextSibling()) {
-        if (child->isTextNode()) {
-            attachTextRenderer(*toText(child));
-            continue;
-        }
-        if (child->isElementNode())
-            attachRenderTree(toElement(child), childrenContext);
-    }
-    styleResolver.popParentShadowRoot(shadowRoot);
-
-    shadowRoot->clearNeedsStyleRecalc();
-    shadowRoot->setAttached(true);
-}
-
 #ifndef NDEBUG
-static bool childAttachedAllowedWhenAttachingChildren(ContainerNode* node)
-{
-    if (node->isShadowRoot())
+static bool childAttachedAllowedWhenAttachingChildren(ContainerNode& node)
+{
+    if (node.isShadowRoot())
         return true;
-    if (node->isInsertionPoint())
+    if (node.isInsertionPoint())
         return true;
-    if (node->isElementNode() && toElement(node)->shadowRoot())
+    if (node.isElementNode() && toElement(&node)->shadowRoot())
         return true;
     return false;
@@ -325 +301 @@
 #endif
 
-static void attachChildren(Element* current, const AttachContext& context)
+static void attachChildren(ContainerNode& current, const AttachContext& context)
 {
     AttachContext childrenContext(context);
     childrenContext.resolvedStyle = 0;
 
-    for (Node* child = current->firstChild(); child; child = child->nextSibling()) {
+    for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
         ASSERT(!child->attached() || childAttachedAllowedWhenAttachingChildren(current));
         if (child->attached())
@@ -343 +319 @@
 }
 
+static void attachShadowRoot(ShadowRoot& shadowRoot, const AttachContext& context)
+{
+    if (shadowRoot.attached())
+        return;
+    StyleResolver& styleResolver = shadowRoot.document()->ensureStyleResolver();
+    styleResolver.pushParentShadowRoot(&shadowRoot);
+
+    attachChildren(shadowRoot, context);
+
+    styleResolver.popParentShadowRoot(&shadowRoot);
+
+    shadowRoot.clearNeedsStyleRecalc();
+    shadowRoot.setAttached(true);
+}
+
 void attachRenderTree(Element* current, const AttachContext& context)
 {
@@ -363 +354 @@
     if (ShadowRoot* shadowRoot = current->shadowRoot()) {
         parentPusher.push();
-        attachShadowRoot(shadowRoot, context);
+        attachShadowRoot(*shadowRoot, context);
     } else if (current->firstChild())
         parentPusher.push();
 
-    attachChildren(current, context);
+    attachChildren(*current, context);
 
     Node* sibling = current->nextSibling();
@@ -389 +380 @@
 }
 
-static void detachShadowRoot(ShadowRoot* shadowRoot, const AttachContext& context)
-{
-    if (!shadowRoot->attached())
-        return;
-    Style::AttachContext childrenContext(context);
+static void detachChildren(ContainerNode& current, const AttachContext& context)
+{
+    AttachContext childrenContext(context);
     childrenContext.resolvedStyle = 0;
-    for (Node* child = shadowRoot->firstChild(); child; child = child->nextSibling()) {
+
+    for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
         if (child->isTextNode()) {
             Style::detachTextRenderer(*toText(child));
@@ -401 +391 @@
         }
         if (child->isElementNode())
-            detachRenderTree(toElement(child), context);
-    }
-    shadowRoot->clearChildNeedsStyleRecalc();
-    shadowRoot->setAttached(false);
-}
-
-static void detachChildren(Element* current, const AttachContext& context)
-{
-    AttachContext childrenContext(context);
-    childrenContext.resolvedStyle = 0;
-
-    for (Node* child = current->firstChild(); child; child = child->nextSibling()) {
-        if (child->isTextNode()) {
-            Style::detachTextRenderer(*toText(child));
-            continue;
-        }
-        if (child->isElementNode())
             detachRenderTree(toElement(child), childrenContext);
     }
-    current->clearChildNeedsStyleRecalc();
+    current.clearChildNeedsStyleRecalc();
+}
+
+static void detachShadowRoot(ShadowRoot& shadowRoot, const AttachContext& context)
+{
+    if (!shadowRoot.attached())
+        return;
+    detachChildren(shadowRoot, context);
+
+    shadowRoot.setAttached(false);
 }
 
@@ -438 +420 @@
 
     if (ShadowRoot* shadowRoot = current->shadowRoot())
-        detachShadowRoot(shadowRoot, context);
-
-    detachChildren(current, context);
+        detachShadowRoot(*shadowRoot, context);
+
+    detachChildren(*current, context);
 
     if (current->renderer())