<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164242] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164242">164242</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 12:19:42 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTreeScopeAdoptercpp">trunk/Source/WebCore/dom/TreeScopeAdopter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164241 => 164242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-17 20:07:35 UTC (rev 164241)
+++ trunk/Source/WebCore/ChangeLog 2014-02-17 20:19:42 UTC (rev 164242)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-02-17 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Build failure caused by missing jsmin module
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (164241 => 164242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-17 20:07:35 UTC (rev 164241)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-17 20:19:42 UTC (rev 164242)
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> , m_touchEventRegionsDirty(false)
</span><span class="cx"> , m_touchEventsChangedTimer(this, &Document::touchEventsChangedTimerFired)
</span><span class="cx"> #endif
</span><del>- , m_selfOnlyRefCount(1)
</del><ins>+ , m_referencingNodeCount(0)
</ins><span class="cx"> , m_styleResolverThrowawayTimer(this, &Document::styleResolverThrowawayTimerFired, timeBeforeThrowingAwayStyleResolverAfterLastUseInSeconds)
</span><span class="cx"> , m_didCalculateStyleResolver(false)
</span><span class="cx"> , m_hasNodesWithPlaceholderStyle(false)
</span><span class="lines">@@ -640,11 +640,10 @@
</span><span class="cx"> void Document::removedLastRef()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_deletionHasBegun);
</span><del>- 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();
</del><ins>+ 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();
</ins><span class="cx">
</span><span class="cx"> // We must make sure not to be retaining any of our children through
</span><span class="cx"> // these extra pointers or we will create a reference cycle.
</span><span class="lines">@@ -679,7 +678,7 @@
</span><span class="cx"> // We need to do this right now since selfOnlyDeref() can delete this.
</span><span class="cx"> m_inRemovedLastRefFunction = false;
</span><span class="cx"> #endif
</span><del>- selfOnlyDeref();
</del><ins>+ decrementReferencingNodeCount();
</ins><span class="cx"> } else {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> m_inRemovedLastRefFunction = false;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (164241 => 164242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-02-17 20:07:35 UTC (rev 164241)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-17 20:19:42 UTC (rev 164242)
</span><span class="lines">@@ -263,22 +263,22 @@
</span><span class="cx">
</span><span class="cx"> virtual ~Document();
</span><span class="cx">
</span><del>- // Nodes belonging to this document hold self-only references -
</del><ins>+ // Nodes belonging to this document increase referencingNodeCount -
</ins><span class="cx"> // these are enough to keep the document from being destroyed, but
</span><span class="cx"> // not enough to keep it from removing its children. This allows a
</span><del>- // node that outlives its scope to still have a valid document
</del><ins>+ // node that outlives its document to still have a valid document
</ins><span class="cx"> // pointer without introducing reference cycles.
</span><del>- void selfOnlyRef()
</del><ins>+ void incrementReferencingNodeCount()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_deletionHasBegun);
</span><del>- ++m_selfOnlyRefCount;
</del><ins>+ ++m_referencingNodeCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- void selfOnlyDeref()
</del><ins>+ void decrementReferencingNodeCount()
</ins><span class="cx"> {
</span><del>- ASSERT(!m_deletionHasBegun || m_selfOnlyRefCount == 1);
- --m_selfOnlyRefCount;
- if (m_selfOnlyRefCount == 1 && !refCount()) {
</del><ins>+ ASSERT(!m_deletionHasBegun || !m_referencingNodeCount);
+ --m_referencingNodeCount;
+ if (!m_referencingNodeCount && !refCount()) {
</ins><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx"> m_deletionHasBegun = true;
</span><span class="cx"> #endif
</span><span class="lines">@@ -1344,7 +1344,7 @@
</span><span class="cx">
</span><span class="cx"> void styleResolverThrowawayTimerFired(DeferrableOneShotTimer<Document>&);
</span><span class="cx">
</span><del>- unsigned m_selfOnlyRefCount;
</del><ins>+ unsigned m_referencingNodeCount;
</ins><span class="cx">
</span><span class="cx"> DeferrableOneShotTimer<Document> m_styleResolverThrowawayTimer;
</span><span class="cx">
</span><span class="lines">@@ -1715,7 +1715,7 @@
</span><span class="cx"> , m_previous(0)
</span><span class="cx"> , m_next(0)
</span><span class="cx"> {
</span><del>- document->selfOnlyRef();
</del><ins>+ document->incrementReferencingNodeCount();
</ins><span class="cx">
</span><span class="cx"> #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
</span><span class="cx"> trackForDebugging();
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (164241 => 164242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-02-17 20:07:35 UTC (rev 164241)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-02-17 20:19:42 UTC (rev 164242)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> if (!isContainerNode())
</span><span class="cx"> willBeDeletedFrom(&document());
</span><span class="cx">
</span><del>- document().selfOnlyDeref();
</del><ins>+ document().decrementReferencingNodeCount();
</ins><span class="cx">
</span><span class="cx"> InspectorCounters::decrementCounter(InspectorCounters::NodeCounter);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomTreeScopeAdoptercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeScopeAdopter.cpp (164241 => 164242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TreeScopeAdopter.cpp 2014-02-17 20:07:35 UTC (rev 164241)
+++ trunk/Source/WebCore/dom/TreeScopeAdopter.cpp 2014-02-17 20:19:42 UTC (rev 164242)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> Document& newDocument = m_newScope.documentScope();
</span><span class="cx"> bool willMoveToNewDocument = &oldDocument != &newDocument;
</span><span class="cx"> if (willMoveToNewDocument) {
</span><del>- oldDocument.selfOnlyRef();
</del><ins>+ oldDocument.incrementReferencingNodeCount();
</ins><span class="cx"> oldDocument.incDOMTreeVersion();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (willMoveToNewDocument)
</span><del>- oldDocument.selfOnlyDeref();
</del><ins>+ oldDocument.decrementReferencingNodeCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TreeScopeAdopter::moveShadowTreeToNewDocument(ShadowRoot* shadowRoot, Document* oldDocument, Document* newDocument) const
</span><span class="lines">@@ -112,8 +112,8 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!node->inDocument() || oldDocument != newDocument);
</span><span class="cx">
</span><del>- newDocument->selfOnlyRef();
- oldDocument->selfOnlyDeref();
</del><ins>+ newDocument->incrementReferencingNodeCount();
+ oldDocument->decrementReferencingNodeCount();
</ins><span class="cx">
</span><span class="cx"> if (node->hasRareData()) {
</span><span class="cx"> NodeRareData* rareData = node->rareData();
</span></span></pre>
</div>
</div>
</body>
</html>