Changeset 139839 in webkit

Timestamp:

Jan 15, 2013 11:36:55 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Get rid of Node::createRareData
​https://bugs.webkit.org/show_bug.cgi?id=106981

Reviewed by Benjamin Poulain.

Deleted Node::createRareData. Node::ensureRareData() instantiates NodeRareData
or ElementRareData according to the node type. Also encapsulate new by create
functions in NodeRareData and ElementRareData.

• dom/Element.cpp:

(WebCore):

• dom/Element.h:

(Element):

• dom/ElementRareData.h:

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

• dom/Node.cpp:

(WebCore::Node::ensureRareData):
(WebCore):

• dom/Node.h:

(WebCore::NodeRareDataBase::NodeRareDataBase):

• dom/NodeRareData.h:

(NodeRareData):
(WebCore::NodeRareData::create):
(WebCore::NodeRareData::NodeRareData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• dom/ElementRareData.h (modified) (3 diffs)
• dom/Node.cpp (modified) (1 diff)
• dom/Node.h (modified) (2 diffs)
• dom/NodeRareData.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Get rid of Node::createRareData
+        https://bugs.webkit.org/show_bug.cgi?id=106981
+
+        Reviewed by Benjamin Poulain.
+
+        Deleted Node::createRareData. Node::ensureRareData() instantiates NodeRareData
+        or ElementRareData according to the node type. Also encapsulate new by create
+        functions in NodeRareData and ElementRareData.
+
+        * dom/Element.cpp:
+        (WebCore):
+        * dom/Element.h:
+        (Element):
+        * dom/ElementRareData.h:
+        (WebCore::ElementRareData::create):
+        (ElementRareData):
+        (WebCore::ElementRareData::ElementRareData):
+        * dom/Node.cpp:
+        (WebCore::Node::ensureRareData):
+        (WebCore):
+        * dom/Node.h:
+        (WebCore::NodeRareDataBase::NodeRareDataBase):
+        * dom/NodeRareData.h:
+        (NodeRareData):
+        (WebCore::NodeRareData::create):
+        (WebCore::NodeRareData::NodeRareData):
+
 2013-01-15  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -224 +224 @@
 }
 
-PassOwnPtr<NodeRareData> Element::createRareData()
-{
-    return adoptPtr(new ElementRareData());
-}
-
 void Element::clearTabIndexExplicitlyIfNeeded()
 {

trunk/Source/WebCore/dom/Element.h

@@ -581 +581 @@
 
     QualifiedName m_tagName;
-    virtual PassOwnPtr<NodeRareData> createRareData();
     bool rareDataStyleAffectedByEmpty() const;
     bool rareDataChildrenAffectedByHover() const;

trunk/Source/WebCore/dom/ElementRareData.h

@@ -36 +36 @@
 class ElementRareData : public NodeRareData {
 public:
-    ElementRareData();
+    static PassOwnPtr<ElementRareData> create(RenderObject* renderer) { return adoptPtr(new ElementRareData(renderer)); }
+
     ~ElementRareData();
 
@@ -173 +174 @@
     RefPtr<PseudoElement> m_generatedAfter;
 
+    ElementRareData(RenderObject*);
     void releasePseudoElement(PseudoElement*);
 };
@@ -181 +183 @@
 }
 
-inline ElementRareData::ElementRareData()
-    : m_tabIndex(0)
+inline ElementRareData::ElementRareData(RenderObject* renderer)
+    : NodeRareData(renderer)
+    , m_tabIndex(0)
     , m_childIndex(0)
     , m_tabIndexWasSetExplicitly(false)

trunk/Source/WebCore/dom/Node.cpp

@@ -453 +453 @@
         return rareData();
 
-    NodeRareData* data = createRareData().leakPtr();
+    NodeRareData* data;
+    if (isElementNode())
+        data = ElementRareData::create(m_data.m_renderer).leakPtr();
+    else
+        data = NodeRareData::create(m_data.m_renderer).leakPtr();
     ASSERT(data);
-    data->setRenderer(m_data.m_renderer);
+
     m_data.m_rareData = data;
     setFlag(HasRareDataFlag);
     return data;
-}
-
-PassOwnPtr<NodeRareData> Node::createRareData()
-{
-    return adoptPtr(new NodeRareData());
 }
 

trunk/Source/WebCore/dom/Node.h

@@ -117 +117 @@
 
 protected:
-    NodeRareDataBase() { }
+    NodeRareDataBase(RenderObject* renderer)
+        : m_renderer(renderer)
+    { }
 
 private:
@@ -786 +788 @@
     virtual void derefEventTarget();
 
-    virtual PassOwnPtr<NodeRareData> createRareData();
-
     virtual RenderStyle* nonRendererStyle() const { return 0; }
 

trunk/Source/WebCore/dom/NodeRareData.h

@@ -277 +277 @@
 class NodeRareData : public NodeRareDataBase {
     WTF_MAKE_NONCOPYABLE(NodeRareData); WTF_MAKE_FAST_ALLOCATED;
-public:    
-    NodeRareData()
-    { }
+public:
+    static PassOwnPtr<NodeRareData> create(RenderObject* renderer) { return adoptPtr(new NodeRareData(renderer)); }
 
     void clearNodeLists() { m_nodeLists.clear(); }
@@ -310 +309 @@
     void reportMemoryUsage(MemoryObjectInfo*) const;
 
+protected:
+    NodeRareData(RenderObject* renderer)
+        : NodeRareDataBase(renderer)
+    { }
+
 private:
     OwnPtr<NodeListsNodeData> m_nodeLists;