Changeset 84050 in webkit

Timestamp:

Apr 15, 2011 4:47:24 PM (13 years ago)

Author:

rolandsteiner@chromium.org

Message:

2011-04-15 Roland Steiner <​rolandsteiner@chromium.org>

Reviewed by Dimitri Glazkov.

Bug 52963 - Enable O(1) access to root from any node in shadow DOM subtree
​https://bugs.webkit.org/show_bug.cgi?id=52963

.) Change base class of ShadowRoot from DocumentFragment to TreeScope.
.) Re-enable tree scope handling in Node (had ASSERT_NOT_REACHED, etc.).
.) Merged setTreeScope() with setTreeScopeRecursively()
.) Call setTreeScopeRecursively in DOM manipulation functions where applicable.

No new tests. (refactoring)

• dom/ContainerNode.cpp: (WebCore::ContainerNode::takeAllChildrenFrom): (WebCore::ContainerNode::removeBetween): (WebCore::ContainerNode::removeChildren): (WebCore::ContainerNode::parserAddChild):
• dom/Document.cpp: (WebCore::Document::Document): (WebCore::Document::~Document): (WebCore::Document::setDocType):
• dom/Element.h:
• dom/Node.cpp: (WebCore::Node::treeScope): (WebCore::Node::setTreeScopeRecursively):
• dom/Node.h: (WebCore::Node::document):
• dom/ShadowRoot.cpp: (WebCore::ShadowRoot::ShadowRoot): (WebCore::ShadowRoot::~ShadowRoot): (WebCore::ShadowRoot::nodeType): (WebCore::ShadowRoot::cloneNode): (WebCore::ShadowRoot::childTypeAllowed):
• dom/ShadowRoot.h: (WebCore::toShadowRoot):
• dom/TreeScope.cpp: (WebCore::TreeScope::TreeScope): (WebCore::TreeScope::setParentTreeScope):
• dom/TreeScope.h:
• rendering/RenderSlider.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (4 diffs)
• dom/Document.cpp (modified) (4 diffs)
• dom/Element.h (modified) (2 diffs)
• dom/Node.cpp (modified) (3 diffs)
• dom/Node.h (modified) (2 diffs)
• dom/ShadowRoot.cpp (modified) (2 diffs)
• dom/ShadowRoot.h (modified) (4 diffs)
• dom/TreeScope.cpp (modified) (2 diffs)
• dom/TreeScope.h (modified) (2 diffs)
• rendering/RenderSlider.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-15  Roland Steiner  <rolandsteiner@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Bug 52963 - Enable O(1) access to root from any node in shadow DOM subtree
+        https://bugs.webkit.org/show_bug.cgi?id=52963
+
+        .) Change base class of ShadowRoot from DocumentFragment to TreeScope.
+        .) Re-enable tree scope handling in Node (had ASSERT_NOT_REACHED, etc.).
+        .) Merged setTreeScope() with setTreeScopeRecursively()
+        .) Call setTreeScopeRecursively in DOM manipulation functions where applicable.
+
+        No new tests. (refactoring)
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::takeAllChildrenFrom):
+        (WebCore::ContainerNode::removeBetween):
+        (WebCore::ContainerNode::removeChildren):
+        (WebCore::ContainerNode::parserAddChild):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::~Document):
+        (WebCore::Document::setDocType):
+        * dom/Element.h:
+        * dom/Node.cpp:
+        (WebCore::Node::treeScope):
+        (WebCore::Node::setTreeScopeRecursively):
+        * dom/Node.h:
+        (WebCore::Node::document):
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::ShadowRoot):
+        (WebCore::ShadowRoot::~ShadowRoot):
+        (WebCore::ShadowRoot::nodeType):
+        (WebCore::ShadowRoot::cloneNode):
+        (WebCore::ShadowRoot::childTypeAllowed):
+        * dom/ShadowRoot.h:
+        (WebCore::toShadowRoot):
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::TreeScope):
+        (WebCore::TreeScope::setParentTreeScope):
+        * dom/TreeScope.h:
+        * rendering/RenderSlider.cpp:
+
 2011-04-15  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WebCore/dom/ContainerNode.cpp

@@ -91 +91 @@
         ASSERT(!ec);
         parserAddChild(child.get());
+        // FIXME: Together with adoptNode above, the tree scope might get updated recursively twice
+        // (if the document changed or oldParent was in a shadow tree, AND *this is in a shadow tree).
+        // Can we do better?
+        child->setTreeScopeRecursively(treeScope());
         if (attached() && !child->attached())
             child->attach();
@@ -482 +486 @@
     oldChild->setParent(0);
 
+    oldChild->setTreeScopeRecursively(document());
+
     allowEventDispatch();
 }
@@ -531 +537 @@
         n->setNextSibling(0);
         n->setParent(0);
+        n->setTreeScopeRecursively(document());
 
         m_firstChild = next;
@@ -649 +656 @@
     // FIXME: This method should take a PassRefPtr.
     appendChildToContainer<Node, ContainerNode>(newChild.get(), this);
+    newChild->setTreeScopeRecursively(treeScope());
+    
     allowEventDispatch();
 

trunk/Source/WebCore/dom/Document.cpp

@@ -378 +378 @@
 
 Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
-    : TreeScope(this)
+    : TreeScope(0)
     , m_guardRefCount(0)
     , m_compatibilityMode(NoQuirksMode)
@@ -435 +435 @@
     , m_writeRecursionDepth(0)
 {
+
     m_document = this;
 
@@ -515 +516 @@
     ASSERT(!m_styleRecalcTimer.isActive());
     ASSERT(!m_parentTreeScope);
+    ASSERT(!m_guardRefCount);
 
     m_scriptRunner.clear();
@@ -666 +668 @@
     m_docType = docType;
     if (m_docType)
-        m_docType->setTreeScope(this);
+        m_docType->setTreeScopeRecursively(this);
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -40 +40 @@
 class ElementRareData;
 class IntSize;
+class ShadowRoot;
 class WebKitAnimationList;
 
@@ -230 +231 @@
     virtual void recalcStyle(StyleChange = NoChange);
 
+    // FIXME: Make these return a proper ShadowRoot* (bug 58703).
     ContainerNode* shadowRoot() const;
     ContainerNode* ensureShadowRoot();

trunk/Source/WebCore/dom/Node.cpp

@@ -78 +78 @@
 #include "ScriptController.h"
 #include "SelectorNodeList.h"
+#include "ShadowRoot.h"
 #include "StaticNodeList.h"
 #include "TagNodeList.h"
@@ -469 +470 @@
 TreeScope* Node::treeScope() const
 {
+    // FIXME: Using m_document directly is not good -> see comment with document() in the header file.
     if (!hasRareData())
-        return document();
+        return m_document;
     TreeScope* scope = rareData()->treeScope();
-    // FIXME: Until we land shadow scopes, there should be no non-document scopes.
-    ASSERT(!scope);
-    return scope ? scope : document();
-}
-
-void Node::setTreeScope(TreeScope* newTreeScope)
-{
-    ASSERT(!isDocumentNode());
+    return scope ? scope : m_document;
+}
+
+void Node::setTreeScopeRecursively(TreeScope* newTreeScope, bool includeRoot)
+{
+    ASSERT(this);
+    ASSERT(!includeRoot || !isDocumentNode());
     ASSERT(newTreeScope);
-    ASSERT(!inDocument() || treeScope() == newTreeScope);
-
-    if (newTreeScope->isDocumentNode()) {
-        if (hasRareData())
-            rareData()->setTreeScope(0);
-        // Setting the new document scope will be handled implicitly
-        // by setDocument() below.
-    } else {
-        // FIXME: Until we land shadow scopes, this branch should be inert.
-        ASSERT_NOT_REACHED();
-        ensureRareData()->setTreeScope(newTreeScope);
-    }
-
-    setDocument(newTreeScope->document());
-}
-
-void Node::setTreeScopeRecursively(TreeScope* newTreeScope)
-{
-    ASSERT(!isDocumentNode());
-    ASSERT(newTreeScope);
-    if (treeScope() == newTreeScope)
+    ASSERT(!m_deletionHasBegun);
+
+    TreeScope* currentTreeScope = treeScope();
+    if (currentTreeScope == newTreeScope)
         return;
 
@@ -513 +497 @@
         currentDocument->incDOMTreeVersion();
 
-    for (Node* node = this; node; node = node->traverseNextNode(this)) {
-        node->setTreeScope(newTreeScope);
-        // FIXME: Once shadow scopes are landed, update parent scope, etc.
+    for (Node* node = includeRoot ? this : traverseNextNode(this); node; node = node->traverseNextNode(this)) {
+        if (newTreeScope == newDocument) {
+            if (node->hasRareData())
+                node->rareData()->setTreeScope(0);
+            // Setting the new document tree scope will be handled implicitly
+            // by setDocument() below.
+        } else
+            node->ensureRareData()->setTreeScope(newTreeScope);
+
+        node->setDocument(newDocument);
+
+        if (!node->isElementNode())
+            continue;
+        // FIXME: Remove toShadowRoot() once shadowRoot() returns a proper ShadowRoot* (bug 58703).
+        if (ShadowRoot* shadowRoot = toShadowRoot(toElement(node)->shadowRoot())) {
+            shadowRoot->setParentTreeScope(newTreeScope);
+            if (currentDocument != newDocument)
+                shadowRoot->setDocumentRecursively(newDocument);
+        }
     }
 }

trunk/Source/WebCore/dom/Node.h

@@ -353 +353 @@
     {
         ASSERT(this);
+        // FIXME: below ASSERT is useful, but prevents the use of document() in the constructor or destructor
+        // due to the virtual function call to nodeType().
         ASSERT(m_document || (nodeType() == DOCUMENT_TYPE_NODE && !inDocument()));
         return m_document;
@@ -359 +361 @@
     TreeScope* treeScope() const;
 
-    // Do not use this method to change the scope of a node until after the node has been
-    // removed from its previous scope. Do not use to change documents.
-    void setTreeScope(TreeScope*);
-
     // Used by the basic DOM methods (e.g., appendChild()).
-    void setTreeScopeRecursively(TreeScope*);
+    void setTreeScopeRecursively(TreeScope*, bool includeRoot = true);
 
     // Returns true if this node is associated with a document and is in its associated document's

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -28 +28 @@
 #include "ShadowRoot.h"
 
+#include "Document.h"
+#include "NodeRareData.h"
+
 namespace WebCore {
 
 ShadowRoot::ShadowRoot(Document* document)
-    : DocumentFragment(document)
+    : TreeScope(document)
 {
     ASSERT(document);
+    
+    // Assume document as parent scope.
+    setParentTreeScope(document);
+    // Shadow tree scopes have the scope pointer point to themselves.
+    // This way, direct children will receive the correct scope pointer.
+    ensureRareData()->setTreeScope(this);
+}
+
+ShadowRoot::~ShadowRoot()
+{
 }
 
@@ -39 +52 @@
 {
     return "#shadow-root";
+}
+
+Node::NodeType ShadowRoot::nodeType() const
+{
+    // FIXME: Decide correct node type (bug 58704).
+    return DOCUMENT_FRAGMENT_NODE;
+}
+
+PassRefPtr<Node> ShadowRoot::cloneNode(bool)
+{
+    // ShadowRoot should not be arbitrarily cloned.
+    return 0;
+}
+
+bool ShadowRoot::childTypeAllowed(NodeType type) const
+{
+    switch (type) {
+    case ELEMENT_NODE:
+    case PROCESSING_INSTRUCTION_NODE:
+    case COMMENT_NODE:
+    case TEXT_NODE:
+    case CDATA_SECTION_NODE:
+    case ENTITY_REFERENCE_NODE:
+        return true;
+    default:
+        return false;
+    }
 }
 

trunk/Source/WebCore/dom/ShadowRoot.h

@@ -28 +28 @@
 #define ShadowRoot_h
 
-#include "DocumentFragment.h"
+#include "TreeScope.h"
 
 namespace WebCore {
@@ -34 +34 @@
 class Document;
 
-class ShadowRoot : public DocumentFragment {
+class ShadowRoot : public TreeScope {
 public:
     static PassRefPtr<ShadowRoot> create(Document*);
@@ -43 +43 @@
 private:
     ShadowRoot(Document*);
+    virtual ~ShadowRoot();
+
     virtual String nodeName() const;
+    virtual NodeType nodeType() const;
+    virtual PassRefPtr<Node> cloneNode(bool deep);
+    virtual bool childTypeAllowed(NodeType) const;
 };
 
@@ -51 +56 @@
 }
 
+inline ShadowRoot* toShadowRoot(Node* node)
+{
+    ASSERT(!node || node->isShadowBoundary());
+    return static_cast<ShadowRoot*>(node);
+}
+
 } // namespace
 

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -37 +37 @@
 using namespace HTMLNames;
 
-TreeScope::TreeScope(Document* document, ConstructionType constructionType)
-    : ContainerNode(0, constructionType)
+TreeScope::TreeScope(Document* document)
+    : ContainerNode(document)
     , m_parentTreeScope(0)
     , m_accessKeyMapValid(false)
     , m_numNodeListCaches(0)
 {
-    m_document = document;
-    if (document != this) {
-        // Assume document as parent scope
-        m_parentTreeScope = document;
-        // FIXME: This branch should be inert until shadow scopes are landed.
-        ASSERT_NOT_REACHED();
-    }
 }
 
@@ -70 +63 @@
     ASSERT(!isDocumentNode());
     // Every scope other than document needs a parent scope.
-    ASSERT(m_parentTreeScope);
     ASSERT(newParentScope);
 

trunk/Source/WebCore/dom/TreeScope.h

@@ -40 +40 @@
 public:
     TreeScope* parentTreeScope() const { return m_parentTreeScope; }
+    void setParentTreeScope(TreeScope*);
 
     Element* getElementById(const AtomicString&) const;
@@ -66 +67 @@
 
 protected:
-    TreeScope(Document*, ConstructionType = CreateContainer);
-
+    TreeScope(Document*);
     virtual ~TreeScope();
 
     void destroyTreeScopeData();
-
-    void setParentTreeScope(TreeScope*);
 
 private:

trunk/Source/WebCore/rendering/RenderSlider.cpp

@@ -38 +38 @@
 #include "RenderTheme.h"
 #include "RenderView.h"
-#include "ShadowElement.h"
+#include "ShadowRoot.h"
 #include "SliderThumbElement.h"
 #include "StepRange.h"