Changeset 137535 in webkit

Timestamp:

Dec 12, 2012 4:32:18 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r137524.
​http://trac.webkit.org/changeset/137524
​https://bugs.webkit.org/show_bug.cgi?id=104859

Causes m_deletionHasBegun assertion failures in
MutationObserver tests (Requested by aklein on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-12-12

• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::~Document):
(WebCore::Document::suggestedMIMEType):

• dom/Document.h:

(WebCore::Node::isDocumentNode):
(WebCore):
(WebCore::Node::treeScope):
(WebCore::Node::Node):

• dom/Element.cpp:

(WebCore::Element::createRareData):

• dom/ElementRareData.h:

(ElementRareData):
(WebCore::ElementRareData::ElementRareData):

• dom/Node.cpp:

(WebCore::Node::~Node):
(WebCore::Node::setDocument):
(WebCore):
(WebCore::Node::setTreeScope):
(WebCore::Node::createRareData):
(WebCore::Node::attach):
(WebCore::Node::reportMemoryUsage):

• dom/Node.h:

(WebCore):
(WebCore::NodeRareDataBase::treeScope):
(WebCore::NodeRareDataBase::setTreeScope):
(NodeRareDataBase):
(WebCore::NodeRareDataBase::NodeRareDataBase):
(Node):
(WebCore::Node::inDocument):
(WebCore::Node::documentInternal):

• dom/NodeRareData.cpp:

(SameSizeAsNodeRareData):
(WebCore::NodeRareData::reportMemoryUsage):

• dom/NodeRareData.h:

(WebCore::NodeRareData::NodeRareData):

• dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::ShadowRoot):

• dom/TreeScope.cpp:

(SameSizeAsTreeScope):
(WebCore::TreeScope::TreeScope):
(WebCore::TreeScope::setParentTreeScope):

• dom/TreeScope.h:

(WebCore):
(TreeScope):

• dom/TreeScopeAdopter.cpp:

(WebCore::TreeScopeAdopter::moveTreeToNewScope):
(WebCore::TreeScopeAdopter::moveNodeToNewDocument):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (4 diffs)
• dom/Document.h (modified) (2 diffs)
• dom/Element.cpp (modified) (1 diff)
• dom/ElementRareData.h (modified) (2 diffs)
• dom/Node.cpp (modified) (5 diffs)
• dom/Node.h (modified) (8 diffs)
• dom/NodeRareData.cpp (modified) (2 diffs)
• dom/NodeRareData.h (modified) (1 diff)
• dom/ShadowRoot.cpp (modified) (2 diffs)
• dom/TreeScope.cpp (modified) (3 diffs)
• dom/TreeScope.h (modified) (4 diffs)
• dom/TreeScopeAdopter.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-12  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r137524.
+        http://trac.webkit.org/changeset/137524
+        https://bugs.webkit.org/show_bug.cgi?id=104859
+
+        Causes m_deletionHasBegun assertion failures in
+        MutationObserver tests (Requested by aklein on #webkit).
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::~Document):
+        (WebCore::Document::suggestedMIMEType):
+        * dom/Document.h:
+        (WebCore::Node::isDocumentNode):
+        (WebCore):
+        (WebCore::Node::treeScope):
+        (WebCore::Node::Node):
+        * dom/Element.cpp:
+        (WebCore::Element::createRareData):
+        * dom/ElementRareData.h:
+        (ElementRareData):
+        (WebCore::ElementRareData::ElementRareData):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+        (WebCore::Node::setDocument):
+        (WebCore):
+        (WebCore::Node::setTreeScope):
+        (WebCore::Node::createRareData):
+        (WebCore::Node::attach):
+        (WebCore::Node::reportMemoryUsage):
+        * dom/Node.h:
+        (WebCore):
+        (WebCore::NodeRareDataBase::treeScope):
+        (WebCore::NodeRareDataBase::setTreeScope):
+        (NodeRareDataBase):
+        (WebCore::NodeRareDataBase::NodeRareDataBase):
+        (Node):
+        (WebCore::Node::inDocument):
+        (WebCore::Node::documentInternal):
+        * dom/NodeRareData.cpp:
+        (SameSizeAsNodeRareData):
+        (WebCore::NodeRareData::reportMemoryUsage):
+        * dom/NodeRareData.h:
+        (WebCore::NodeRareData::NodeRareData):
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::ShadowRoot):
+        * dom/TreeScope.cpp:
+        (SameSizeAsTreeScope):
+        (WebCore::TreeScope::TreeScope):
+        (WebCore::TreeScope::setParentTreeScope):
+        * dom/TreeScope.h:
+        (WebCore):
+        (TreeScope):
+        * dom/TreeScopeAdopter.cpp:
+        (WebCore::TreeScopeAdopter::moveTreeToNewScope):
+        (WebCore::TreeScopeAdopter::moveNodeToNewDocument):
+
 2012-12-12  Seokju Kwon  <seokju.kwon@gmail.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -437 +437 @@
 
 Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
-    : ContainerNode(this, CreateDocument)
+    : ContainerNode(0, CreateDocument)
     , TreeScope(this)
     , m_guardRefCount(0)
@@ -511 +511 @@
 #endif
 {
+    m_document = this;
+
     m_printing = false;
     m_paginatedForScreen = false;
@@ -667 +669 @@
     for (unsigned i = 0; i < WTF_ARRAY_LENGTH(m_nodeListCounts); i++)
         ASSERT(!m_nodeListCounts[i]);
+
+    m_document = 0;
 
     InspectorCounters::decrementCounter(InspectorCounters::DocumentCounter);
@@ -1342 +1346 @@
 String Document::suggestedMIMEType() const
 {
-    if (isXHTMLDocument())
+    if (m_document->isXHTMLDocument())
         return "application/xhtml+xml";
-    if (isSVGDocument())
+    if (m_document->isSVGDocument())
         return "image/svg+xml";
-    if (xmlStandalone())
+    if (m_document->xmlStandalone())
         return "text/xml";
-    if (isHTMLDocument())
+    if (m_document->isHTMLDocument())
         return "text/html";
 

trunk/Source/WebCore/dom/Document.h

@@ -1560 +1560 @@
 inline bool Node::isDocumentNode() const
 {
-    return this == documentInternal();
+    return this == m_document;
+}
+
+inline TreeScope* Node::treeScope() const
+{
+    return hasRareData() ? m_data.m_rareData->treeScope() : documentInternal();
 }
 
 inline Node::Node(Document* document, ConstructionType type)
     : m_nodeFlags(type)
-    , m_treeScope(document)
+    , m_document(document)
     , m_previous(0)
     , m_next(0)
@@ -1571 +1576 @@
     if (document)
         document->guardRef();
-    else
-        m_treeScope = TreeScope::noDocumentInstance();
-
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
     trackForDebugging();

trunk/Source/WebCore/dom/Element.cpp

@@ -218 +218 @@
 PassOwnPtr<NodeRareData> Element::createRareData()
 {
-    return adoptPtr(new ElementRareData());
+    return adoptPtr(new ElementRareData(documentInternal()));
 }
 

trunk/Source/WebCore/dom/ElementRareData.h

@@ -36 +36 @@
 class ElementRareData : public NodeRareData {
 public:
-    ElementRareData();
+    ElementRareData(Document*);
     virtual ~ElementRareData();
 
@@ -131 +131 @@
 }
 
-inline ElementRareData::ElementRareData()
-    : m_minimumSizeForResizing(defaultMinimumSizeForResizing())
+inline ElementRareData::ElementRareData(Document* document)
+    : NodeRareData(document)
+    , m_minimumSizeForResizing(defaultMinimumSizeForResizing())
     , m_generatedBefore(0)
     , m_generatedAfter(0)

trunk/Source/WebCore/dom/Node.cpp

@@ -419 +419 @@
         detach();
 
-    Document* doc = documentInternal();
+    Document* doc = m_document;
     if (AXObjectCache::accessibilityEnabled() && doc && doc->axObjectCacheExists() && !isContainerNode())
         doc->axObjectCache()->remove(this);
@@ -432 +432 @@
 
     InspectorCounters::decrementCounter(InspectorCounters::NodeCounter);
+}
+
+void Node::setDocument(Document* document)
+{
+    ASSERT(!inDocument() || m_document == document);
+    if (inDocument() || m_document == document)
+        return;
+
+    m_document = document;
+}
+
+void Node::setTreeScope(TreeScope* scope)
+{
+    if (!hasRareData() && scope->rootNode()->isDocumentNode())
+        return;
+
+    ensureRareData()->setTreeScope(scope);
 }
 
@@ -455 +472 @@
 PassOwnPtr<NodeRareData> Node::createRareData()
 {
-    return adoptPtr(new NodeRareData());
+    return adoptPtr(new NodeRareData(documentInternal()));
 }
 
@@ -1066 +1083 @@
     clearNeedsStyleRecalc();
 
-    Document* doc = documentInternal();
+    Document* doc = m_document;
     if (AXObjectCache::accessibilityEnabled() && doc && doc->axObjectCacheExists())
         doc->axObjectCache()->updateCacheAfterNodeIsAttached(this);
@@ -2583 +2600 @@
     TreeShared<Node, ContainerNode>::reportMemoryUsage(memoryObjectInfo);
     ScriptWrappable::reportMemoryUsage(memoryObjectInfo);
-    info.addMember(m_treeScope);
+    info.addMember(m_document);
     info.addMember(m_next);
     info.addMember(m_previous);

trunk/Source/WebCore/dom/Node.h

@@ -34 +34 @@
 #include "ScriptWrappable.h"
 #include "SimulatedClickOptions.h"
-#include "TreeScope.h"
 #include "TreeShared.h"
 #include <wtf/Forward.h>
@@ -87 +86 @@
 class ShadowRoot;
 class TagNodeList;
+class TreeScope;
 
 #if ENABLE(GESTURE_EVENTS)
@@ -116 +116 @@
     void setRenderer(RenderObject* renderer) { m_renderer = renderer; }
 
+    TreeScope* treeScope() const { return m_treeScope; }
+    void setTreeScope(TreeScope* scope) { m_treeScope = scope; }
+
     virtual ~NodeRareDataBase() { }
 protected:
-    NodeRareDataBase() { }
+    NodeRareDataBase(TreeScope* scope)
+        : m_treeScope(scope)
+    {
+    }
 private:
     RenderObject* m_renderer;
+    TreeScope* m_treeScope;
 };
 
@@ -453 +460 @@
     }
 
-    TreeScope* treeScope() const { return m_treeScope; }
+    TreeScope* treeScope() const;
 
     // Returns true if this node is associated with a document and is in its associated document's
@@ -459 +466 @@
     bool inDocument() const 
     { 
-        ASSERT(documentInternal() || !getFlag(InDocumentFlag));
+        ASSERT(m_document || !getFlag(InDocumentFlag));
         return getFlag(InDocumentFlag);
     }
@@ -750 +757 @@
     void setHasCustomCallbacks() { setFlag(true, HasCustomCallbacksFlag); }
 
-    Document* documentInternal() const { return treeScope()->documentScope(); }
-    void setTreeScope(TreeScope* scope) { m_treeScope = scope; }
+    Document* documentInternal() const { return m_document; }
 
 private:
@@ -757 +763 @@
 
     void removedLastRef();
+
+    // These API should be only used for a tree scope migration.
+    void setTreeScope(TreeScope*);
+    void setDocument(Document*);
 
     enum EditableLevel { Editable, RichlyEditable };
@@ -800 +810 @@
 
     mutable uint32_t m_nodeFlags;
-    TreeScope* m_treeScope;
+    Document* m_document;
     Node* m_previous;
     Node* m_next;

trunk/Source/WebCore/dom/NodeRareData.cpp

@@ -40 +40 @@
 
 struct SameSizeAsNodeRareData {
-    void* m_pointer[3];
+    void* m_pointer[4];
     unsigned m_indicesAndBitfields[2];
 
@@ -65 +65 @@
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
+    info.addMember(treeScope());
     info.addMember(m_nodeLists);
 

trunk/Source/WebCore/dom/NodeRareData.h

@@ -247 +247 @@
 
 public:    
-    NodeRareData()
-        : m_tabIndex(0)
+    NodeRareData(Document* document)
+        : NodeRareDataBase(document)
+        , m_tabIndex(0)
         , m_childIndex(0)
         , m_tabIndexWasSetExplicitly(false)

trunk/Source/WebCore/dom/ShadowRoot.cpp

@@ -66 +66 @@
 ShadowRoot::ShadowRoot(Document* document)
     : DocumentFragment(document, CreateShadowRoot)
-    , TreeScope(this, document)
+    , TreeScope(this)
     , m_prev(0)
     , m_next(0)
@@ -76 +76 @@
 {
     ASSERT(document);
-    setTreeScope(this);
+    
+    // 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);
 }
 

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -56 +56 @@
 struct SameSizeAsTreeScope {
     virtual ~SameSizeAsTreeScope();
-    void* pointers[8];
+    void* pointers[7];
 };
 
@@ -63 +63 @@
 using namespace HTMLNames;
 
-TreeScope::TreeScope(ContainerNode* rootNode, Document* document)
+TreeScope::TreeScope(ContainerNode* rootNode)
     : m_rootNode(rootNode)
-    , m_documentScope(document)
-    , m_parentTreeScope(document)
-    , m_idTargetObserverRegistry(IdTargetObserverRegistry::create())
-{
-    ASSERT(rootNode);
-    ASSERT(document);
-    ASSERT(rootNode != document);
-}
-
-TreeScope::TreeScope(Document* document)
-    : m_rootNode(document)
-    , m_documentScope(document)
     , m_parentTreeScope(0)
     , m_idTargetObserverRegistry(IdTargetObserverRegistry::create())
 {
-    ASSERT(document);
-}
-
-TreeScope::TreeScope()
-    : m_rootNode(0)
-    , m_documentScope(0)
-    , m_parentTreeScope(0)
-{
+    ASSERT(rootNode);
 }
 
@@ -113 +94 @@
 
     m_parentTreeScope = newParentScope;
-    setDocumentScope(newParentScope->documentScope());
 }
 

trunk/Source/WebCore/dom/TreeScope.h

@@ -36 +36 @@
 class ContainerNode;
 class DOMSelection;
-class Document;
 class Element;
 class HTMLLabelElement;
@@ -48 +47 @@
 class TreeScope {
     friend class Document;
-    friend class TreeScopeAdopter;
 
 public:
@@ -60 +58 @@
     void addElementById(const AtomicString& elementId, Element*);
     void removeElementById(const AtomicString& elementId, Element*);
-
-    Document* documentScope() const { return m_documentScope; }
 
     Node* ancestorInThisScope(Node*) const;
@@ -96 +92 @@
     virtual void reportMemoryUsage(MemoryObjectInfo*) const;
 
-    static TreeScope* noDocumentInstance()
-    {
-        DEFINE_STATIC_LOCAL(TreeScope, instance, ());
-        return &instance;
-    }
-
 protected:
-    TreeScope(ContainerNode*, Document*);
-    TreeScope(Document*);
+    explicit TreeScope(ContainerNode*);
     virtual ~TreeScope();
 
     void destroyTreeScopeData();
-    void setDocumentScope(Document* document)
-    {
-        ASSERT(document);
-        ASSERT(this != noDocumentInstance());
-        m_documentScope = document;
-    }
 
 private:
-    TreeScope();
-
     ContainerNode* m_rootNode;
-    Document* m_documentScope;
     TreeScope* m_parentTreeScope;
 

trunk/Source/WebCore/dom/TreeScopeAdopter.cpp

@@ -44 +44 @@
     // of the document it was moved to. By increasing the DOMTreeVersion of the donating document here
     // we ensure that the collection cache will be invalidated as needed when the element is moved back.
-    Document* oldDocument = m_oldScope->documentScope();
-    Document* newDocument = m_newScope->documentScope();
+    Document* oldDocument = m_oldScope ? m_oldScope->rootNode()->document() : 0;
+    Document* newDocument = m_newScope->rootNode()->document();
     bool willMoveToNewDocument = oldDocument != newDocument;
     if (oldDocument && willMoveToNewDocument)
@@ -52 +52 @@
     for (Node* node = root; node; node = NodeTraversal::next(node, root)) {
         node->setTreeScope(m_newScope);
-
         if (node->hasRareData()) {
             NodeRareData* rareData = node->rareData();
@@ -99 +98 @@
         oldDocument->moveNodeIteratorsToNewDocument(node, newDocument);
 
-    if (node->isShadowRoot())
-        toShadowRoot(node)->setDocumentScope(newDocument);
+    node->setDocument(newDocument);
 
 #ifndef NDEBUG