Changeset 164248 in webkit

Timestamp:

Feb 17, 2014, 2:12:30 PM (11 years ago)

Author:

Antti Koivisto

Message:

Node constructor should take Document reference
​https://bugs.webkit.org/show_bug.cgi?id=128931

Reviewed by Geoff Garen.

• dom/Attr.cpp:

(WebCore::Attr::Attr):

• dom/CharacterData.h:

(WebCore::CharacterData::CharacterData):

• dom/ContainerNode.cpp:

(WebCore::ContainerNode::~ContainerNode):

• dom/ContainerNode.h:

(WebCore::ContainerNode::ContainerNode):

• dom/Document.cpp:

(WebCore::Document::Document):

• dom/Document.h:

(WebCore::Node::Node):

• dom/DocumentFragment.cpp:

(WebCore::DocumentFragment::DocumentFragment):
(WebCore::DocumentFragment::create):

• dom/DocumentFragment.h:
• dom/DocumentType.cpp:

(WebCore::DocumentType::DocumentType):

• dom/Element.h:

(WebCore::Element::Element):

• dom/Entity.h:

(WebCore::Entity::Entity):

• dom/EntityReference.cpp:

(WebCore::EntityReference::EntityReference):

• dom/Node.cpp:

(WebCore::Node::~Node):
(WebCore::Node::willBeDeletedFrom):

• dom/Node.h:
• dom/Notation.cpp:
• dom/Notation.h:

(WebCore::Notation::publicId):
(WebCore::Notation::systemId):
(WebCore::Notation::Notation):

Remove cruft from this non-instantiated class.

• dom/ShadowRoot.cpp:

(WebCore::ShadowRoot::ShadowRoot):
(WebCore::ShadowRoot::~ShadowRoot):

• dom/TemplateContentDocumentFragment.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Attr.cpp (modified) (2 diffs)
• dom/CharacterData.h (modified) (1 diff)
• dom/ContainerNode.cpp (modified) (1 diff)
• dom/ContainerNode.h (modified) (2 diffs)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/DocumentFragment.cpp (modified) (2 diffs)
• dom/DocumentFragment.h (modified) (1 diff)
• dom/DocumentType.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• dom/Entity.h (modified) (1 diff)
• dom/EntityReference.cpp (modified) (1 diff)
• dom/Node.cpp (modified) (2 diffs)
• dom/Node.h (modified) (2 diffs)
• dom/Notation.cpp (modified) (1 diff)
• dom/Notation.h (modified) (1 diff)
• dom/ShadowRoot.cpp (modified) (2 diffs)
• dom/TemplateContentDocumentFragment.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog ¶

@@ +1 @@
+2014-02-17  Antti Koivisto  <antti@apple.com>
+
+        Node constructor should take Document reference
+        https://bugs.webkit.org/show_bug.cgi?id=128931
+
+        Reviewed by Geoff Garen.
+
+        * dom/Attr.cpp:
+        (WebCore::Attr::Attr):
+        * dom/CharacterData.h:
+        (WebCore::CharacterData::CharacterData):
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::~ContainerNode):
+        * dom/ContainerNode.h:
+        (WebCore::ContainerNode::ContainerNode):
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * dom/Document.h:
+        (WebCore::Node::Node):
+        * dom/DocumentFragment.cpp:
+        (WebCore::DocumentFragment::DocumentFragment):
+        (WebCore::DocumentFragment::create):
+        * dom/DocumentFragment.h:
+        * dom/DocumentType.cpp:
+        (WebCore::DocumentType::DocumentType):
+        * dom/Element.h:
+        (WebCore::Element::Element):
+        * dom/Entity.h:
+        (WebCore::Entity::Entity):
+        * dom/EntityReference.cpp:
+        (WebCore::EntityReference::EntityReference):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+        (WebCore::Node::willBeDeletedFrom):
+        * dom/Node.h:
+        * dom/Notation.cpp:
+        * dom/Notation.h:
+        (WebCore::Notation::publicId):
+        (WebCore::Notation::systemId):
+        (WebCore::Notation::Notation):
+        
+            Remove cruft from this non-instantiated class.
+
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::ShadowRoot):
+        (WebCore::ShadowRoot::~ShadowRoot):
+        * dom/TemplateContentDocumentFragment.h:
+
 2014-02-17  Sergio Correia  <sergio.correia@openbossa.org>
 

trunk/Source/WebCore/dom/Attr.cpp ¶

@@ -38 +38 @@
 
 Attr::Attr(Element* element, const QualifiedName& name)
-    : ContainerNode(&element->document())
+    : ContainerNode(element->document())
     , m_element(element)
     , m_name(name)
@@ -46 +46 @@
 
 Attr::Attr(Document& document, const QualifiedName& name, const AtomicString& standaloneValue)
-    : ContainerNode(&document)
+    : ContainerNode(document)
     , m_element(0)
     , m_name(name)

trunk/Source/WebCore/dom/CharacterData.h ¶

@@ -50 +50 @@
 protected:
     CharacterData(Document& document, const String& text, ConstructionType type)
-        : Node(&document, type)
+        : Node(document, type)
         , m_data(!text.isNull() ? text : emptyString())
     {

trunk/Source/WebCore/dom/ContainerNode.cpp ¶

@@ -151 +151 @@
 ContainerNode::~ContainerNode()
 {
-    willBeDeletedFrom(&document());
+    willBeDeletedFrom(document());
     removeDetachedChildren();
 }

trunk/Source/WebCore/dom/ContainerNode.h ¶

@@ -139 +139 @@
 
 protected:
-    explicit ContainerNode(Document*, ConstructionType = CreateContainer);
+    explicit ContainerNode(Document&, ConstructionType = CreateContainer);
 
     static void queuePostAttachCallback(NodeCallback, Node&, unsigned = 0);
@@ -183 +183 @@
 NODE_TYPE_CASTS(ContainerNode)
 
-inline ContainerNode::ContainerNode(Document* document, ConstructionType type)
+inline ContainerNode::ContainerNode(Document& document, ConstructionType type)
     : Node(document, type)
     , m_firstChild(0)

trunk/Source/WebCore/dom/Document.cpp ¶

@@ -394 +394 @@
 
 Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsigned constructionFlags)
-    : ContainerNode(this, CreateDocument)
+    : ContainerNode(*this, CreateDocument)
     , TreeScope(*this)
 #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)

trunk/Source/WebCore/dom/Document.h ¶

@@ -1709 +1709 @@
 }
 
-inline Node::Node(Document* document, ConstructionType type)
+inline Node::Node(Document& document, ConstructionType type)
     : m_nodeFlags(type)
     , m_parentNode(0)
-    , m_treeScope(document)
+    , m_treeScope(&document)
     , m_previous(0)
     , m_next(0)
 {
-    document->incrementReferencingNodeCount();
+    document.incrementReferencingNodeCount();
 
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)

trunk/Source/WebCore/dom/DocumentFragment.cpp ¶

@@ -32 +32 @@
 namespace WebCore {
 
-DocumentFragment::DocumentFragment(Document* document, ConstructionType constructionType)
+DocumentFragment::DocumentFragment(Document& document, ConstructionType constructionType)
     : ContainerNode(document, constructionType)
 {
@@ -39 +39 @@
 PassRefPtr<DocumentFragment> DocumentFragment::create(Document& document)
 {
-    return adoptRef(new DocumentFragment(&document, Node::CreateDocumentFragment));
+    return adoptRef(new DocumentFragment(document, Node::CreateDocumentFragment));
 }
 
 PassRefPtr<DocumentFragment> DocumentFragment::create(ScriptExecutionContext& context)
 {
-    return adoptRef(new DocumentFragment(&toDocument(context), Node::CreateDocumentFragment));
+    return adoptRef(new DocumentFragment(toDocument(context), Node::CreateDocumentFragment));
 }
 

trunk/Source/WebCore/dom/DocumentFragment.h ¶

@@ -44 +44 @@
 
 protected:
-    DocumentFragment(Document*, ConstructionType = CreateContainer);
+    DocumentFragment(Document&, ConstructionType = CreateContainer);
     virtual String nodeName() const override;
 

trunk/Source/WebCore/dom/DocumentType.cpp ¶

@@ -30 +30 @@
 
 DocumentType::DocumentType(Document& document, const String& name, const String& publicId, const String& systemId)
-    : Node(&document, CreateOther)
+    : Node(document, CreateOther)
     , m_name(name)
     , m_publicId(publicId)

trunk/Source/WebCore/dom/Element.h ¶

@@ -570 +570 @@
 protected:
     Element(const QualifiedName& tagName, Document& document, ConstructionType type)
-        : ContainerNode(&document, type)
+        : ContainerNode(document, type)
         , m_tagName(tagName)
     {

trunk/Source/WebCore/dom/Entity.h ¶

@@ -36 +36 @@
 
 private:
-    Entity() : ContainerNode(0) {}
+    Entity(Document& document)
+        : ContainerNode(document)
+    { }
 };
 

trunk/Source/WebCore/dom/EntityReference.cpp ¶

@@ -27 +27 @@
 
 inline EntityReference::EntityReference(Document& document, const String& entityName)
-    : ContainerNode(&document)
+    : ContainerNode(document)
     , m_entityName(entityName)
 {

trunk/Source/WebCore/dom/Node.cpp ¶

@@ -307 +307 @@
 
     if (!isContainerNode())
-        willBeDeletedFrom(&document());
+        willBeDeletedFrom(document());
 
     document().decrementReferencingNodeCount();
@@ -314 +314 @@
 }
 
-void Node::willBeDeletedFrom(Document* document)
+void Node::willBeDeletedFrom(Document& document)
 {
     if (hasEventTargetData()) {
 #if ENABLE(TOUCH_EVENTS) && PLATFORM(IOS)
-        if (document)
-            document->removeTouchEventListener(this, true);
+        document.removeTouchEventListener(this, true);
 #endif
         clearEventTargetData();
     }
 
-    if (document) {
-        if (AXObjectCache* cache = document->existingAXObjectCache())
-            cache->remove(this);
-    }
+    if (AXObjectCache* cache = document.existingAXObjectCache())
+        cache->remove(this);
 }
 

trunk/Source/WebCore/dom/Node.h ¶

@@ -154 +154 @@
 
     virtual ~Node();
-    void willBeDeletedFrom(Document*);
+    void willBeDeletedFrom(Document&);
 
     // DOM methods & attributes for Node
@@ -625 +625 @@
         CreateMathMLElement = CreateStyledElement | IsMathMLFlag,
     };
-    Node(Document*, ConstructionType);
+    Node(Document&, ConstructionType);
 
     virtual void didMoveToNewDocument(Document* oldDocument);

trunk/Source/WebCore/dom/Notation.cpp ¶

@@ -1 @@
-/*
- * Copyright (C) 2000 Peter Kelly (pmk@post.com)
- * Copyright (C) 2006, 2009 Apple Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "Notation.h"
-
-#include "Document.h"
-
-namespace WebCore {
-
-Notation::Notation(Document& document, const String& name, const String& publicId, const String& systemId)
-    : ContainerNode(&document)
-    , m_name(name)
-    , m_publicId(publicId)
-    , m_systemId(systemId)
-{
-}
-
-String Notation::nodeName() const
-{
-    return m_name;
-}
-
-Node::NodeType Notation::nodeType() const
-{
-    return NOTATION_NODE;
-}
-
-PassRefPtr<Node> Notation::cloneNode(bool /*deep*/)
-{
-    // Spec says cloning Notation nodes is "implementation dependent". We do not support it.
-    return 0;
-}
-
-bool Notation::childTypeAllowed(NodeType) const
-{
-    return false;
-}
-
-} // namespace
+// FIXME: remove me

trunk/Source/WebCore/dom/Notation.h ¶

@@ -29 +29 @@
 // FIXME: This class is never instantiated. Maybe it should be removed.
 
-class Notation final : public ContainerNode {
+class Notation : public ContainerNode {
 public:
-    const String& publicId() const { return m_publicId; }
-    const String& systemId() const { return m_systemId; }
+    String publicId() const { ASSERT_NOT_REACHED(); return String(); }
+    String systemId() const { ASSERT_NOT_REACHED(); return String(); }
 
 private:
-    Notation(Document&, const String& name, const String& publicId, const String& systemId);
-
-    virtual String nodeName() const override;
-    virtual NodeType nodeType() const override;
-    virtual PassRefPtr<Node> cloneNode(bool deep) override;
-    virtual bool childTypeAllowed(NodeType) const override;
-
-    String m_name;
-    String m_publicId;
-    String m_systemId;
+    Notation(Document& document)
+        : ContainerNode(document)
+    { }
 };
 

trunk/Source/WebCore/dom/ShadowRoot.cpp ¶

@@ -53 +53 @@
 
 ShadowRoot::ShadowRoot(Document& document, ShadowRootType type)
-    : DocumentFragment(&document, CreateShadowRoot)
+    : DocumentFragment(document, CreateShadowRoot)
     , TreeScope(*this, document)
     , m_resetStyleInheritance(false)
@@ -67 +67 @@
     // clears Node::m_treeScope thus ContainerNode is no longer able
     // to access it Document reference after that.
-    willBeDeletedFrom(&document());
+    willBeDeletedFrom(document());
 
     // We must remove all of our children first before the TreeScope destructor

trunk/Source/WebCore/dom/TemplateContentDocumentFragment.h ¶

@@ -46 +46 @@
 private:
     TemplateContentDocumentFragment(Document& document, const Element* host)
-        : DocumentFragment(&document, CreateDocumentFragment)
+        : DocumentFragment(document, CreateDocumentFragment)
         , m_host(host)
     {