Changeset 118654 in webkit

Timestamp:

May 28, 2012, 1:40:02 AM (14 years ago)

Author:

morrita@google.com

Message:

[Refactoring][ShadowDOM] Some ElementShadow methods can be inlined.
​https://bugs.webkit.org/show_bug.cgi?id=87617

Reviewed by Kentaro Hara.

Inlined ElementShadow::attachHost(), ElementShadow::detachHost() and
ElementShadow::reattach()

No new tests. No behavior change.

• dom/Element.cpp:

(WebCore::Element::attach):
(WebCore::Element::detach):

• dom/ElementShadow.cpp:

(WebCore::ElememtnShadow::reattachHostChildrenAndShadow):

• dom/ElementShadow.h:

(ElementShadow):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• dom/ElementShadow.cpp (modified) (4 diffs)
• dom/ElementShadow.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-27  MORITA Hajime  <morrita@google.com>
+
+        [Refactoring][ShadowDOM] Some ElementShadow methods can be inlined.
+        https://bugs.webkit.org/show_bug.cgi?id=87617
+
+        Reviewed by Kentaro Hara.
+
+        Inlined ElementShadow::attachHost(), ElementShadow::detachHost() and
+        ElementShadow::reattach()
+
+        No new tests. No behavior change.
+
+        * dom/Element.cpp:
+        (WebCore::Element::attach):
+        (WebCore::Element::detach):
+        * dom/ElementShadow.cpp:
+        (WebCore::ElememtnShadow::reattachHostChildrenAndShadow):
+        * dom/ElementShadow.h:
+        (ElementShadow):
+
 2012-05-28  Peter Rybin  <peter.rybin@gmail.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -948 +948 @@
     if (ElementShadow* shadow = this->shadow()) {
         parentPusher.push();
-        shadow->attachHost(this);
+        shadow->attach();
+        attachChildrenIfNeeded();
+        attachAsNode();
     } else {
         if (firstChild())
@@ -984 +986 @@
         rareData()->resetComputedStyle();
 
-    if (ElementShadow* shadow = this->shadow())
-        shadow->detachHost(this);
-    else
+    if (ElementShadow* shadow = this->shadow()) {
+        detachChildrenIfNeeded();
+        shadow->detach();
+        detachAsNode();
+    } else
         ContainerNode::detach();
 

trunk/Source/WebCore/dom/ElementShadow.cpp

@@ -124 +124 @@
 }
 
-void ElementShadow::attachHost(Element* host)
-{
-    attach();
-    host->attachChildrenIfNeeded();
-    host->attachAsNode();
-}
-
 void ElementShadow::detach()
 {
@@ -139 +132 @@
 }
 
-void ElementShadow::detachHost(Element* host)
-{
-    host->detachChildrenIfNeeded();
-    detach();
-    host->detachAsNode();
-}
-
 InsertionPoint* ElementShadow::insertionPointFor(const Node* node) const
 {
@@ -158 +144 @@
 
     return distributor().findInsertionPointFor(node);
-}
-
-void ElementShadow::reattach()
-{
-    detach();
-    attach();
 }
 
@@ -242 +222 @@
     Element* hostNode = youngestShadowRoot()->host();
     hostNode->detachChildrenIfNeeded();
-    reattach();
+    detach();
+    attach();
     hostNode->attachChildrenIfNeeded();
 }

trunk/Source/WebCore/dom/ElementShadow.h

@@ -57 +57 @@
     void attach();
     void detach();
-    void reattach();
-    void attachHost(Element*);
-    void detachHost(Element*);
 
     bool childNeedsStyleRecalc();