Changeset 84251 in webkit

Timestamp:

Apr 19, 2011 6:41:54 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-19 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r84050.
​http://trac.webkit.org/changeset/84050
​https://bugs.webkit.org/show_bug.cgi?id=58892

fast/dom/HTMLKeygenElement/keygen.html is crashing on Chromium
(Requested by jknotten on #webkit).

• 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::setTreeScope): (WebCore::Node::setTreeScopeRecursively):
• dom/Node.h: (WebCore::Node::document):
• dom/ShadowRoot.cpp: (WebCore::ShadowRoot::ShadowRoot):
• dom/ShadowRoot.h:
• 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-19  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r84050.
+        http://trac.webkit.org/changeset/84050
+        https://bugs.webkit.org/show_bug.cgi?id=58892
+
+        fast/dom/HTMLKeygenElement/keygen.html is crashing on Chromium
+        (Requested by jknotten on #webkit).
+
+        * 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::setTreeScope):
+        (WebCore::Node::setTreeScopeRecursively):
+        * dom/Node.h:
+        (WebCore::Node::document):
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::ShadowRoot):
+        * dom/ShadowRoot.h:
+        * dom/TreeScope.cpp:
+        (WebCore::TreeScope::TreeScope):
+        (WebCore::TreeScope::setParentTreeScope):
+        * dom/TreeScope.h:
+        * rendering/RenderSlider.cpp:
+
 2011-04-19  Kinuko Yasuda  <kinuko@chromium.org>
 

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();
@@ -486 +482 @@
     oldChild->setParent(0);
 
-    oldChild->setTreeScopeRecursively(document());
-
     allowEventDispatch();
 }
@@ -537 +531 @@
         n->setNextSibling(0);
         n->setParent(0);
-        n->setTreeScopeRecursively(document());
 
         m_firstChild = next;
@@ -656 +649 @@
     // 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(0)
+    : TreeScope(this)
     , m_guardRefCount(0)
     , m_compatibilityMode(NoQuirksMode)
@@ -434 +434 @@
     , m_writeRecursionDepth(0)
 {
-
     m_document = this;
 
@@ -515 +514 @@
     ASSERT(!m_styleRecalcTimer.isActive());
     ASSERT(!m_parentTreeScope);
-    ASSERT(!m_guardRefCount);
 
     m_scriptRunner.clear();
@@ -673 +671 @@
     m_docType = docType;
     if (m_docType)
-        m_docType->setTreeScopeRecursively(this);
+        m_docType->setTreeScope(this);
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -40 +40 @@
 class ElementRareData;
 class IntSize;
-class ShadowRoot;
 class WebKitAnimationList;
 
@@ -231 +230 @@
     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"
@@ -470 +469 @@
 TreeScope* Node::treeScope() const
 {
-    // FIXME: Using m_document directly is not good -> see comment with document() in the header file.
     if (!hasRareData())
-        return m_document;
+        return document();
     TreeScope* scope = rareData()->treeScope();
-    return scope ? scope : m_document;
-}
-
-void Node::setTreeScopeRecursively(TreeScope* newTreeScope, bool includeRoot)
-{
-    ASSERT(this);
-    ASSERT(!includeRoot || !isDocumentNode());
+    // 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());
     ASSERT(newTreeScope);
-    ASSERT(!m_deletionHasBegun);
-
-    TreeScope* currentTreeScope = treeScope();
-    if (currentTreeScope == 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)
         return;
 
@@ -497 +513 @@
         currentDocument->incDOMTreeVersion();
 
-    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);
-        }
+    for (Node* node = this; node; node = node->traverseNextNode(this)) {
+        node->setTreeScope(newTreeScope);
+        // FIXME: Once shadow scopes are landed, update parent scope, etc.
     }
 }

trunk/Source/WebCore/dom/Node.h

@@ -360 +360 @@
     {
         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;
@@ -368 +366 @@
     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*, bool includeRoot = true);
+    void setTreeScopeRecursively(TreeScope*);
 
     // 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)
-    : TreeScope(document)
+    : DocumentFragment(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()
-{
 }
 
@@ -52 +39 @@
 {
     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 "TreeScope.h"
+#include "DocumentFragment.h"
 
 namespace WebCore {
@@ -34 +34 @@
 class Document;
 
-class ShadowRoot : public TreeScope {
+class ShadowRoot : public DocumentFragment {
 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;
 };
 
@@ -56 +51 @@
 }
 
-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)
-    : ContainerNode(document)
+TreeScope::TreeScope(Document* document, ConstructionType constructionType)
+    : ContainerNode(0, constructionType)
     , 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();
+    }
 }
 
@@ -63 +70 @@
     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;
@@ -67 +66 @@
 
 protected:
-    TreeScope(Document*);
+    TreeScope(Document*, ConstructionType = CreateContainer);
+
     virtual ~TreeScope();
 
     void destroyTreeScopeData();
+
+    void setParentTreeScope(TreeScope*);
 
 private:

trunk/Source/WebCore/rendering/RenderSlider.cpp

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