Changeset 109718 in webkit

Timestamp:

Mar 5, 2012 12:22:33 AM (12 years ago)

Author:

shinyak@chromium.org

Message:

Refactoring: Move HTMLContentElement::attach to InsertionPoint::attach.
​https://bugs.webkit.org/show_bug.cgi?id=80243

Reviewed by Hajime Morita.

Since the current code in HTMLContentElement::attach() will be used for coming <shadow>
elements, it is natural that InsertionPoint::attach() has such code.

No new tests, no change in behavior.

• html/shadow/HTMLContentElement.cpp:
• html/shadow/HTMLContentElement.h:

(HTMLContentElement):

• html/shadow/InsertionPoint.cpp:

(WebCore::InsertionPoint::attach):
(WebCore):
(WebCore::InsertionPoint::detach):

• html/shadow/InsertionPoint.h:

(InsertionPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/HTMLContentElement.cpp (modified) (1 diff)
• html/shadow/HTMLContentElement.h (modified) (1 diff)
• html/shadow/InsertionPoint.cpp (modified) (2 diffs)
• html/shadow/InsertionPoint.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-05  Shinya Kawanaka  <shinyak@chromium.org>
+
+        Refactoring: Move HTMLContentElement::attach to InsertionPoint::attach.
+        https://bugs.webkit.org/show_bug.cgi?id=80243
+
+        Reviewed by Hajime Morita.
+
+        Since the current code in HTMLContentElement::attach() will be used for coming <shadow>
+        elements, it is natural that InsertionPoint::attach() has such code.
+
+        No new tests, no change in behavior.
+
+        * html/shadow/HTMLContentElement.cpp:
+        * html/shadow/HTMLContentElement.h:
+        (HTMLContentElement):
+        * html/shadow/InsertionPoint.cpp:
+        (WebCore::InsertionPoint::attach):
+        (WebCore):
+        (WebCore::InsertionPoint::detach):
+        * html/shadow/InsertionPoint.h:
+        (InsertionPoint):
+
 2012-03-05  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/html/shadow/HTMLContentElement.cpp

@@ -69 +69 @@
 }
 
-void HTMLContentElement::attach()
-{
-    ShadowRoot* root = toShadowRoot(shadowTreeRootNode());
-
-    // Before calling StyledElement::attach, selector must be calculated.
-    if (root) {
-        HTMLContentSelector* selector = root->tree()->ensureSelector();
-        selector->unselect(&m_selections);
-        selector->select(this, &m_selections);
-    }
-
-    InsertionPoint::attach();
-
-    if (root) {
-        for (HTMLContentSelection* selection = m_selections.first(); selection; selection = selection->next())
-            selection->node()->attach();
-    }
-}
-
-void HTMLContentElement::detach()
-{
-    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
-        if (HTMLContentSelector* selector = root->tree()->selector())
-            selector->unselect(&m_selections);
-
-        // When content element is detached, shadow tree should be recreated to re-calculate selector for
-        // other insertion points.
-        root->tree()->setNeedsReattachHostChildrenAndShadow();
-    }
-
-    ASSERT(m_selections.isEmpty());
-    InsertionPoint::detach();
-}
-
 const AtomicString& HTMLContentElement::select() const
 {

trunk/Source/WebCore/html/shadow/HTMLContentElement.h

@@ -45 +45 @@
 
     virtual ~HTMLContentElement();
-    virtual void attach();
-    virtual void detach();
 
     const AtomicString& select() const;

trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

@@ -33 +33 @@
 
 #include "ShadowRoot.h"
+#include "ShadowTree.h"
 
 namespace WebCore {
@@ -44 +45 @@
 InsertionPoint::~InsertionPoint()
 {
+}
+
+void InsertionPoint::attach()
+{
+    ShadowRoot* root = toShadowRoot(shadowTreeRootNode());
+
+    if (root) {
+        HTMLContentSelector* selector = root->tree()->ensureSelector();
+        selector->unselect(&m_selections);
+        selector->select(this, &m_selections);
+    }
+
+    HTMLElement::attach();
+
+    if (root) {
+        for (HTMLContentSelection* selection = m_selections.first(); selection; selection = selection->next())
+            selection->node()->attach();
+    }
+}
+
+void InsertionPoint::detach()
+{
+    if (ShadowRoot* root = toShadowRoot(shadowTreeRootNode())) {
+        if (HTMLContentSelector* selector = root->tree()->selector())
+            selector->unselect(&m_selections);
+
+        // When shadow element is detached, shadow tree should be recreated to re-calculate selector for
+        // other insertion points.
+        root->tree()->setNeedsReattachHostChildrenAndShadow();
+    }
+
+    ASSERT(m_selections.isEmpty());
+    HTMLElement::detach();
 }
 

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -48 +48 @@
     virtual const AtomicString& select() const = 0;
 
+    virtual void attach();
+    virtual void detach();
+
 protected:
     InsertionPoint(const QualifiedName&, Document*);