<!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>[243075] 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/243075">243075</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2019-03-18 10:05:54 -0700 (Mon, 18 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/243037">r243037</a>.

Broke the Windows build

Reverted changeset:

"Reduce the size of Node::deref by eliminating an explicit
parentNode check"
https://bugs.webkit.org/show_bug.cgi?id=195776
https://trac.webkit.org/changeset/243037</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="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (243074 => 243075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-18 16:56:21 UTC (rev 243074)
+++ trunk/Source/WebCore/ChangeLog      2019-03-18 17:05:54 UTC (rev 243075)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2019-03-18  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r243037.
+
+        Broke the Windows build
+
+        Reverted changeset:
+
+        "Reduce the size of Node::deref by eliminating an explicit
+        parentNode check"
+        https://bugs.webkit.org/show_bug.cgi?id=195776
+        https://trac.webkit.org/changeset/243037
+
</ins><span class="cx"> 2019-03-18  Eric Carlson  <eric.carlson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Change some logging levels
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (243074 => 243075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp    2019-03-18 16:56:21 UTC (rev 243074)
+++ trunk/Source/WebCore/dom/Document.cpp       2019-03-18 17:05:54 UTC (rev 243075)
</span><span class="lines">@@ -669,10 +669,6 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_deletionHasBegun);
</span><span class="cx">     if (m_referencingNodeCount) {
</span><del>-        // Node::removedLastRef doesn't set refCount() to zero because it's not observable.
-        // But we need to remember that our refCount reached zero in subsequent calls to decrementReferencingNodeCount()
-        m_refCountAndParentBit = 0;
-
</del><span class="cx">         // If removing a child removes the last node reference, we don't want the scope to be destroyed
</span><span class="cx">         // until after removeDetachedChildren returns, so we protect ourselves.
</span><span class="cx">         incrementReferencingNodeCount();
</span><span class="lines">@@ -722,6 +718,7 @@
</span><span class="cx">         m_inRemovedLastRefFunction = false;
</span><span class="cx">         m_deletionHasBegun = true;
</span><span class="cx"> #endif
</span><ins>+        m_refCount = 1; // Avoid double destruction through use of RefPtr<T>. (This is a security mitigation in case of programmer error. It will ASSERT in debug builds.)
</ins><span class="cx">         delete this;
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (243074 => 243075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h      2019-03-18 16:56:21 UTC (rev 243074)
+++ trunk/Source/WebCore/dom/Document.h 2019-03-18 17:05:54 UTC (rev 243075)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> #if !ASSERT_DISABLED
</span><span class="cx">             m_deletionHasBegun = true;
</span><span class="cx"> #endif
</span><del>-            m_refCountAndParentBit = s_refCountIncrement; // Avoid double destruction through use of Ref<T>/RefPtr<T>. (This is a security mitigation in case of programmer error. It will ASSERT in debug builds.)
</del><ins>+            m_refCount = 1; // Avoid double destruction through use of RefPtr<T>. (This is a security mitigation in case of programmer error. It will ASSERT in debug builds.)
</ins><span class="cx">             delete this;
</span><span class="cx">         }
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (243074 => 243075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp        2019-03-18 16:56:21 UTC (rev 243074)
+++ trunk/Source/WebCore/dom/Node.cpp   2019-03-18 17:05:54 UTC (rev 243075)
</span><span class="lines">@@ -316,7 +316,8 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Node::Node(Document& document, ConstructionType type)
</span><del>-    : m_nodeFlags(type)
</del><ins>+    : m_refCount(1)
+    , m_nodeFlags(type)
</ins><span class="cx">     , m_treeScope(&document)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="lines">@@ -331,9 +332,9 @@
</span><span class="cx"> Node::~Node()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><del>-    // We set m_refCount to 2 before calling delete to avoid double destruction through use of Ref<T>/RefPtr<T>.
</del><ins>+    // We set m_refCount to 1 before calling delete to avoid double destruction through use of Ref<T>/RefPtr<T>.
</ins><span class="cx">     // This is a security mitigation in case of programmer errorm (caught by a debug assertion).
</span><del>-    ASSERT(m_refCountAndParentBit == s_refCountIncrement);
</del><ins>+    ASSERT(m_refCount == 1);
</ins><span class="cx">     ASSERT(m_deletionHasBegun);
</span><span class="cx">     ASSERT(!m_adoptionIsRequired);
</span><span class="cx"> 
</span><span class="lines">@@ -2522,10 +2523,6 @@
</span><span class="cx"> // delete a Node at each deref call site.
</span><span class="cx"> void Node::removedLastRef()
</span><span class="cx"> {
</span><del>-    // This avoids double destruction even when there is a programming error to use Ref<T> / RefPtr<T> on this node.
-    // There are debug assertions in Node::ref() / Node::deref() to catch such a programming error.
-    ASSERT(m_refCountAndParentBit == s_refCountIncrement);
-
</del><span class="cx">     // An explicit check for Document here is better than a virtual function since it is
</span><span class="cx">     // faster for non-Document nodes, and because the call to removedLastRef that is inlined
</span><span class="cx">     // at all deref call sites is smaller if it's a non-virtual function.
</span><span class="lines">@@ -2537,6 +2534,7 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     m_deletionHasBegun = true;
</span><span class="cx"> #endif
</span><ins>+    m_refCount = 1; // Avoid double destruction through use of RefPtr<T>. (This is a security mitigation in case of programmer error. It will ASSERT in debug builds.)
</ins><span class="cx">     delete this;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (243074 => 243075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h  2019-03-18 16:56:21 UTC (rev 243074)
+++ trunk/Source/WebCore/dom/Node.h     2019-03-18 17:05:54 UTC (rev 243075)
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx">     void ref();
</span><span class="cx">     void deref();
</span><span class="cx">     bool hasOneRef() const;
</span><del>-    unsigned refCount() const;
</del><ins>+    int refCount() const;
</ins><span class="cx"> 
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     bool m_deletionHasBegun { false };
</span><span class="lines">@@ -618,9 +618,6 @@
</span><span class="cx">     };
</span><span class="cx">     Node(Document&, ConstructionType);
</span><span class="cx"> 
</span><del>-    static constexpr uint32_t s_refCountIncrement = 2;
-    static constexpr uint32_t s_refCountMask = ~0x1;
-
</del><span class="cx">     virtual void addSubresourceAttributeURLs(ListHashSet<URL>&) const { }
</span><span class="cx"> 
</span><span class="cx">     bool hasRareData() const { return getFlag(HasRareDataFlag); }
</span><span class="lines">@@ -667,7 +664,7 @@
</span><span class="cx">     static void moveTreeToNewScope(Node&, TreeScope& oldScope, TreeScope& newScope);
</span><span class="cx">     void moveNodeToNewDocument(Document& oldDocument, Document& newDocument);
</span><span class="cx"> 
</span><del>-    uint32_t m_refCountAndParentBit { s_refCountIncrement };
</del><ins>+    int m_refCount;
</ins><span class="cx">     mutable uint32_t m_nodeFlags;
</span><span class="cx"> 
</span><span class="cx">     ContainerNode* m_parentNode { nullptr };
</span><span class="lines">@@ -698,25 +695,22 @@
</span><span class="cx">     ASSERT(!m_deletionHasBegun);
</span><span class="cx">     ASSERT(!m_inRemovedLastRefFunction);
</span><span class="cx">     ASSERT(!m_adoptionIsRequired);
</span><del>-    m_refCountAndParentBit += s_refCountIncrement;
</del><ins>+    ++m_refCount;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ALWAYS_INLINE void Node::deref()
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><del>-    ASSERT(refCount());
</del><ins>+    ASSERT(m_refCount >= 0);
</ins><span class="cx">     ASSERT(!m_deletionHasBegun);
</span><span class="cx">     ASSERT(!m_inRemovedLastRefFunction);
</span><span class="cx">     ASSERT(!m_adoptionIsRequired);
</span><del>-    auto tempRefCount = m_refCountAndParentBit - s_refCountIncrement;
-    if (!tempRefCount) {
</del><ins>+    if (--m_refCount <= 0 && !parentNode()) {
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">         m_inRemovedLastRefFunction = true;
</span><span class="cx"> #endif
</span><span class="cx">         removedLastRef();
</span><del>-        return;
</del><span class="cx">     }
</span><del>-    m_refCountAndParentBit = tempRefCount;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ALWAYS_INLINE bool Node::hasOneRef() const
</span><span class="lines">@@ -723,12 +717,12 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!m_deletionHasBegun);
</span><span class="cx">     ASSERT(!m_inRemovedLastRefFunction);
</span><del>-    return refCount() == 1;
</del><ins>+    return m_refCount == 1;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-ALWAYS_INLINE unsigned Node::refCount() const
</del><ins>+ALWAYS_INLINE int Node::refCount() const
</ins><span class="cx"> {
</span><del>-    return m_refCountAndParentBit / s_refCountIncrement;
</del><ins>+    return m_refCount;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Used in Node::addSubresourceAttributeURLs() and in addSubresourceStyleURLs()
</span><span class="lines">@@ -742,8 +736,6 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span><span class="cx">     m_parentNode = parent;
</span><del>-    auto refCountWithoutParentBit = m_refCountAndParentBit & s_refCountMask;
-    m_refCountAndParentBit = refCountWithoutParentBit | !!parent;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> inline ContainerNode* Node::parentNode() const
</span></span></pre>
</div>
</div>

</body>
</html>