Title: [141218] trunk/Source/WebCore
Revision
141218
Author
[email protected]
Date
2013-01-29 20:55:54 -0800 (Tue, 29 Jan 2013)

Log Message

Move ShadowRoot creation into ElementShadow
https://bugs.webkit.org/show_bug.cgi?id=108267

Reviewed by Hajime Morita.

Instead of the ShadowRoot::create method doing crazy factory things and
then needing to assert about the state of the ShadowRoot in addShadowRoot,
just create ShadowRoots from inside ElementShadow.

No new tests, just refactoring.

* dom/Element.cpp:
(WebCore::Element::createShadowRoot): Use addShadowRoot().
(WebCore::Element::ensureUserAgentShadowRoot): Use addShadowRoot().
* dom/ElementShadow.cpp:
(WebCore::ElementShadow::addShadowRoot): Now returns the new ShadowRoot.
* dom/ElementShadow.h:
(ElementShadow):
* dom/ShadowRoot.cpp:
* dom/ShadowRoot.h:
(WebCore::ShadowRoot::create): No longer does the association.
(WebCore::ShadowRoot::setHost): Sets parent tree scope automatically.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (141217 => 141218)


--- trunk/Source/WebCore/ChangeLog	2013-01-30 04:33:31 UTC (rev 141217)
+++ trunk/Source/WebCore/ChangeLog	2013-01-30 04:55:54 UTC (rev 141218)
@@ -1,3 +1,28 @@
+2013-01-29  Elliott Sprehn  <[email protected]>
+
+        Move ShadowRoot creation into ElementShadow
+        https://bugs.webkit.org/show_bug.cgi?id=108267
+
+        Reviewed by Hajime Morita.
+
+        Instead of the ShadowRoot::create method doing crazy factory things and
+        then needing to assert about the state of the ShadowRoot in addShadowRoot,
+        just create ShadowRoots from inside ElementShadow.
+
+        No new tests, just refactoring.
+
+        * dom/Element.cpp:
+        (WebCore::Element::createShadowRoot): Use addShadowRoot().
+        (WebCore::Element::ensureUserAgentShadowRoot): Use addShadowRoot().
+        * dom/ElementShadow.cpp:
+        (WebCore::ElementShadow::addShadowRoot): Now returns the new ShadowRoot.
+        * dom/ElementShadow.h:
+        (ElementShadow):
+        * dom/ShadowRoot.cpp:
+        * dom/ShadowRoot.h:
+        (WebCore::ShadowRoot::create): No longer does the association.
+        (WebCore::ShadowRoot::setHost): Sets parent tree scope automatically.
+
 2013-01-29  Mark Lam  <[email protected]>
 
         Rename DBBackend::Server to DatabaseServer.

Modified: trunk/Source/WebCore/dom/Element.cpp (141217 => 141218)


--- trunk/Source/WebCore/dom/Element.cpp	2013-01-30 04:33:31 UTC (rev 141217)
+++ trunk/Source/WebCore/dom/Element.cpp	2013-01-30 04:55:54 UTC (rev 141218)
@@ -1452,7 +1452,7 @@
 {
 #if ENABLE(SHADOW_DOM)
     if (RuntimeEnabledFeatures::authorShadowDOMForAnyElementEnabled())
-        return ShadowRoot::create(this, ShadowRoot::AuthorShadowRoot);
+        return ensureShadow()->addShadowRoot(this, ShadowRoot::AuthorShadowRoot);
 #endif
 
     // Since some elements recreates shadow root dynamically, multiple shadow
@@ -1462,7 +1462,7 @@
         ec = HIERARCHY_REQUEST_ERR;
         return 0;
     }
-    return ShadowRoot::create(this, ShadowRoot::AuthorShadowRoot);
+    return ensureShadow()->addShadowRoot(this, ShadowRoot::AuthorShadowRoot);
 }
 
 ShadowRoot* Element::shadowRoot() const
@@ -1492,7 +1492,7 @@
 {
     if (ShadowRoot* shadowRoot = userAgentShadowRoot())
         return shadowRoot;
-    ShadowRoot* shadowRoot = ShadowRoot::create(this, ShadowRoot::UserAgentShadowRoot).get();
+    ShadowRoot* shadowRoot = ensureShadow()->addShadowRoot(this, ShadowRoot::UserAgentShadowRoot);
     didAddUserAgentShadowRoot(shadowRoot);
     return shadowRoot;
 }

Modified: trunk/Source/WebCore/dom/ElementShadow.cpp (141217 => 141218)


--- trunk/Source/WebCore/dom/ElementShadow.cpp	2013-01-30 04:33:31 UTC (rev 141217)
+++ trunk/Source/WebCore/dom/ElementShadow.cpp	2013-01-30 04:55:54 UTC (rev 141218)
@@ -32,18 +32,14 @@
 
 namespace WebCore {
 
-void ElementShadow::addShadowRoot(Element* shadowHost, PassRefPtr<ShadowRoot> shadowRoot, ShadowRoot::ShadowRootType type)
+ShadowRoot* ElementShadow::addShadowRoot(Element* shadowHost, ShadowRoot::ShadowRootType type)
 {
-    ASSERT(shadowHost);
-    ASSERT(shadowRoot);
-    ASSERT(!shadowRoot->host());
-    ASSERT(shadowHost->document() == shadowRoot->document());
+    RefPtr<ShadowRoot> shadowRoot = ShadowRoot::create(shadowHost->document(), type);
 
     if (type == ShadowRoot::AuthorShadowRoot)
         shadowHost->willAddAuthorShadowRoot();
 
     shadowRoot->setHost(shadowHost);
-    shadowRoot->setParentTreeScope(shadowHost->treeScope());
     m_shadowRoots.push(shadowRoot.get());
     m_distributor.didShadowBoundaryChange(shadowHost);
     ChildNodeInsertionNotifier(shadowHost).notify(shadowRoot.get());
@@ -58,6 +54,8 @@
         shadowHost->lazyReattach();
 
     InspectorInstrumentation::didPushShadowRoot(shadowHost, shadowRoot.get());
+
+    return shadowRoot.get();
 }
 
 void ElementShadow::removeAllShadowRoots()

Modified: trunk/Source/WebCore/dom/ElementShadow.h (141217 => 141218)


--- trunk/Source/WebCore/dom/ElementShadow.h	2013-01-30 04:33:31 UTC (rev 141217)
+++ trunk/Source/WebCore/dom/ElementShadow.h	2013-01-30 04:55:54 UTC (rev 141218)
@@ -56,7 +56,7 @@
     ShadowRoot* oldestShadowRoot() const { return m_shadowRoots.tail(); }
     ElementShadow* containingShadow() const;
 
-    void addShadowRoot(Element* shadowHost, PassRefPtr<ShadowRoot>, ShadowRoot::ShadowRootType);
+    ShadowRoot* addShadowRoot(Element* shadowHost, ShadowRoot::ShadowRootType);
 
     void attach();
     void detach();

Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (141217 => 141218)


--- trunk/Source/WebCore/dom/ShadowRoot.cpp	2013-01-30 04:33:31 UTC (rev 141217)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp	2013-01-30 04:55:54 UTC (rev 141218)
@@ -114,19 +114,6 @@
         clearRareData();
 }
 
-PassRefPtr<ShadowRoot> ShadowRoot::create(Element* element, ShadowRootType type)
-{
-    ASSERT(element);
-
-    RefPtr<ShadowRoot> shadowRoot = adoptRef(new ShadowRoot(element->document(), type));
-
-    element->ensureShadow()->addShadowRoot(element, shadowRoot, type);
-    ASSERT(element == shadowRoot->host());
-    ASSERT(element->shadow());
-
-    return shadowRoot.release();
-}
-
 PassRefPtr<Node> ShadowRoot::cloneNode(bool)
 {
     // ShadowRoot should not be arbitrarily cloned.

Modified: trunk/Source/WebCore/dom/ShadowRoot.h (141217 => 141218)


--- trunk/Source/WebCore/dom/ShadowRoot.h	2013-01-30 04:33:31 UTC (rev 141217)
+++ trunk/Source/WebCore/dom/ShadowRoot.h	2013-01-30 04:55:54 UTC (rev 141218)
@@ -54,8 +54,12 @@
         UserAgentShadowRoot = 0,
         AuthorShadowRoot
     };
-    static PassRefPtr<ShadowRoot> create(Element*, ShadowRootType);
 
+    static PassRefPtr<ShadowRoot> create(Document* document, ShadowRootType type)
+    {
+        return adoptRef(new ShadowRoot(document, type));
+    }
+
     void recalcStyle(StyleChange);
 
     virtual bool applyAuthorStyles() const OVERRIDE;
@@ -121,6 +125,8 @@
 inline void ShadowRoot::setHost(Element* host)
 {
     setParentOrHostNode(host);
+    if (host)
+        setParentTreeScope(host->treeScope());
 }
 
 inline Element* ShadowRoot::activeElement() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to