Changeset 164242 in webkit

Timestamp:

Feb 17, 2014 12:19:42 PM (10 years ago)

Author:

Antti Koivisto

Message:

Rename Document::m_selfOnlyRefCount to m_referencingNodeCount
​https://bugs.webkit.org/show_bug.cgi?id=128916

Reviewed by Andreas Kling.

Make the name more informative. Also make it zero based (document is not considered to reference itself).

• dom/Document.cpp:

(WebCore::Document::Document):
(WebCore::Document::removedLastRef):

• dom/Document.h:

(WebCore::Document::increaseReferencingNodeCount):
(WebCore::Document::decreaseReferencingNodeCount):
(WebCore::Node::Node):

• dom/Node.cpp:

(WebCore::Node::~Node):

• dom/TreeScopeAdopter.cpp:

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

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (3 diffs)
• dom/Document.h (modified) (3 diffs)
• dom/Node.cpp (modified) (1 diff)
• dom/TreeScopeAdopter.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-02-17  Antti Koivisto  <antti@apple.com>
+
+        Rename Document::m_selfOnlyRefCount to m_referencingNodeCount
+        https://bugs.webkit.org/show_bug.cgi?id=128916
+
+        Reviewed by Andreas Kling.
+
+        Make the name more informative. Also make it zero based (document is not considered to reference itself).
+
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        (WebCore::Document::removedLastRef):
+        * dom/Document.h:
+        (WebCore::Document::increaseReferencingNodeCount):
+        (WebCore::Document::decreaseReferencingNodeCount):
+        (WebCore::Node::Node):
+        * dom/Node.cpp:
+        (WebCore::Node::~Node):
+        * dom/TreeScopeAdopter.cpp:
+        (WebCore::TreeScopeAdopter::moveTreeToNewScope):
+        (WebCore::TreeScopeAdopter::moveNodeToNewDocument):
+
 2014-02-17  ChangSeok Oh  <changseok.oh@collabora.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -401 +401 @@
     , m_touchEventsChangedTimer(this, &Document::touchEventsChangedTimerFired)
 #endif
-    , m_selfOnlyRefCount(1)
+    , m_referencingNodeCount(0)
     , m_styleResolverThrowawayTimer(this, &Document::styleResolverThrowawayTimerFired, timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds)
     , m_didCalculateStyleResolver(false)
@@ -641 +641 @@
 {
     ASSERT(!m_deletionHasBegun);
-    ASSERT(m_selfOnlyRefCount);
-    if (m_selfOnlyRefCount > 1) {
-        // If removing a child removes the last self-only ref, we don't want the scope to be destroyed
-        // until after removeDetachedChildren returns, so we protect ourselves with an extra self-only ref.
-        selfOnlyRef();
+    if (m_referencingNodeCount) {
+        // If removing a child removes the last node reference, we don't want the scope to be destroyed
+        // until after removeDetachedChildren returns, so we protect ourselves.
+        incrementReferencingNodeCount();
 
         // We must make sure not to be retaining any of our children through
@@ -680 +679 @@
         m_inRemovedLastRefFunction = false;
 #endif
-        selfOnlyDeref();
+        decrementReferencingNodeCount();
     } else {
 #ifndef NDEBUG

trunk/Source/WebCore/dom/Document.h

@@ -264 +264 @@
     virtual ~Document();
 
-    // Nodes belonging to this document hold self-only references -
+    // Nodes belonging to this document increase referencingNodeCount -
     // these are enough to keep the document from being destroyed, but
     // not enough to keep it from removing its children. This allows a
-    // node that outlives its scope to still have a valid document
+    // node that outlives its document to still have a valid document
     // pointer without introducing reference cycles.
-    void selfOnlyRef()
+    void incrementReferencingNodeCount()
     {
         ASSERT(!m_deletionHasBegun);
-        ++m_selfOnlyRefCount;
+        ++m_referencingNodeCount;
     }
 
-    void selfOnlyDeref()
+    void decrementReferencingNodeCount()
     {
-        ASSERT(!m_deletionHasBegun || m_selfOnlyRefCount == 1);
-        --m_selfOnlyRefCount;
-        if (m_selfOnlyRefCount == 1 && !refCount()) {
+        ASSERT(!m_deletionHasBegun || !m_referencingNodeCount);
+        --m_referencingNodeCount;
+        if (!m_referencingNodeCount && !refCount()) {
 #if !ASSERT_DISABLED
             m_deletionHasBegun = true;
@@ -1345 +1345 @@
     void styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>&);
 
-    unsigned m_selfOnlyRefCount;
+    unsigned m_referencingNodeCount;
 
     DeferrableOneShotTimer<Document> m_styleResolverThrowawayTimer;
@@ -1716 +1716 @@
     , m_next(0)
 {
-    document->selfOnlyRef();
+    document->incrementReferencingNodeCount();
 
 #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)

trunk/Source/WebCore/dom/Node.cpp

@@ -309 +309 @@
         willBeDeletedFrom(&document());
 
-    document().selfOnlyDeref();
+    document().decrementReferencingNodeCount();
 
     InspectorCounters::decrementCounter(InspectorCounters::NodeCounter);

trunk/Source/WebCore/dom/TreeScopeAdopter.cpp

@@ -46 +46 @@
     bool willMoveToNewDocument = &oldDocument != &newDocument;
     if (willMoveToNewDocument) {
-        oldDocument.selfOnlyRef();
+        oldDocument.incrementReferencingNodeCount();
         oldDocument.incDOMTreeVersion();
     }
@@ -78 +78 @@
 
     if (willMoveToNewDocument)
-        oldDocument.selfOnlyDeref();
+        oldDocument.decrementReferencingNodeCount();
 }
 
@@ -113 +113 @@
     ASSERT(!node->inDocument() || oldDocument != newDocument);
 
-    newDocument->selfOnlyRef();
-    oldDocument->selfOnlyDeref();
+    newDocument->incrementReferencingNodeCount();
+    oldDocument->decrementReferencingNodeCount();
 
     if (node->hasRareData()) {