<!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>[183009] 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/183009">183009</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 02:18:26 -0700 (Mon, 20 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge TreeShared into Node.
&lt;https://webkit.org/b/143942&gt;

Reviewed by Darin Adler.

Node was the only remaining user of TreeShared, so just fold the class into Node.

* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* dom/Node.cpp:
(WebCore::Node::Node):
(WebCore::Node::~Node):
* dom/Node.h:
(WebCore::Node::ref):
(WebCore::Node::deref):
(WebCore::Node::hasOneRef):
(WebCore::Node::refCount):
(WebCore::adopted):
(WebCore::Node::hasTreeSharedParent): Deleted.
* platform/TreeShared.h: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</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>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformTreeSharedh">trunk/Source/WebCore/platform/TreeShared.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183008 => 183009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-04-20 08:31:04 UTC (rev 183008)
+++ trunk/Source/WebCore/ChangeLog        2015-04-20 09:18:26 UTC (rev 183009)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-04-20  Andreas Kling  &lt;akling@apple.com&gt;
+
+        Merge TreeShared into Node.
+        &lt;https://webkit.org/b/143942&gt;
+
+        Reviewed by Darin Adler.
+
+        Node was the only remaining user of TreeShared, so just fold the class into Node.
+
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+        * dom/Node.cpp:
+        (WebCore::Node::Node):
+        (WebCore::Node::~Node):
+        * dom/Node.h:
+        (WebCore::Node::ref):
+        (WebCore::Node::deref):
+        (WebCore::Node::hasOneRef):
+        (WebCore::Node::refCount):
+        (WebCore::adopted):
+        (WebCore::Node::hasTreeSharedParent): Deleted.
+        * platform/TreeShared.h: Removed.
+
</ins><span class="cx"> 2015-04-19  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Improve the feature.json files
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (183008 => 183009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2015-04-20 08:31:04 UTC (rev 183008)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2015-04-20 09:18:26 UTC (rev 183009)
</span><span class="lines">@@ -19897,7 +19897,6 @@
</span><span class="cx">     &lt;ClInclude Include=&quot;..\platform\ThreadGlobalData.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\platform\ThreadTimers.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\platform\Timer.h&quot; /&gt;
</span><del>-    &lt;ClInclude Include=&quot;..\platform\TreeShared.h&quot; /&gt;
</del><span class="cx">     &lt;ClInclude Include=&quot;..\platform\UserActivity.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\platform\HysteresisActivity.h&quot; /&gt;
</span><span class="cx">     &lt;ClInclude Include=&quot;..\platform\UUID.h&quot; /&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (183008 => 183009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2015-04-20 08:31:04 UTC (rev 183008)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2015-04-20 09:18:26 UTC (rev 183009)
</span><span class="lines">@@ -8310,9 +8310,6 @@
</span><span class="cx">     &lt;ClInclude Include=&quot;..\platform\Timer.h&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;platform&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClInclude&gt;
</span><del>-    &lt;ClInclude Include=&quot;..\platform\TreeShared.h&quot;&gt;
-      &lt;Filter&gt;platform&lt;/Filter&gt;
-    &lt;/ClInclude&gt;
</del><span class="cx">     &lt;ClInclude Include=&quot;..\platform\UserActivity.h&quot;&gt;
</span><span class="cx">       &lt;Filter&gt;platform&lt;/Filter&gt;
</span><span class="cx">     &lt;/ClInclude&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (183008 => 183009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2015-04-20 08:31:04 UTC (rev 183008)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2015-04-20 09:18:26 UTC (rev 183009)
</span><span class="lines">@@ -584,7 +584,6 @@
</span><span class="cx">                 14115B7209F84CD600CA4FC1 /* JSNodeFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14115B7009F84CD600CA4FC1 /* JSNodeFilter.cpp */; };
</span><span class="cx">                 14115B7309F84CD600CA4FC1 /* JSNodeFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 14115B7109F84CD600CA4FC1 /* JSNodeFilter.h */; };
</span><span class="cx">                 1411DCB1164C39A800D49BC1 /* WidthCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1411DCB0164C39A800D49BC1 /* WidthCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-                1419D2C50CEA6F6100FF507A /* TreeShared.h in Headers */ = {isa = PBXBuildFile; fileRef = 1419D2C40CEA6F6100FF507A /* TreeShared.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx">                 141DC0481648348F00371E5A /* LayoutUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = 141DC0471648348F00371E5A /* LayoutUnit.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 141DC04F164834B900371E5A /* LayoutBoxExtent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 141DC049164834B900371E5A /* LayoutBoxExtent.cpp */; };
</span><span class="cx">                 141DC050164834B900371E5A /* LayoutBoxExtent.h in Headers */ = {isa = PBXBuildFile; fileRef = 141DC04A164834B900371E5A /* LayoutBoxExtent.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -7633,7 +7632,6 @@
</span><span class="cx">                 14115B7009F84CD600CA4FC1 /* JSNodeFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSNodeFilter.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 14115B7109F84CD600CA4FC1 /* JSNodeFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSNodeFilter.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 1411DCB0164C39A800D49BC1 /* WidthCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidthCache.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><del>-                1419D2C40CEA6F6100FF507A /* TreeShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeShared.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</del><span class="cx">                 141B94E509EC4223000E9413 /* MouseEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = MouseEvent.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 141B94EE09EC425A000E9413 /* UIEvent.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = UIEvent.idl; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 141DC0471648348F00371E5A /* LayoutUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutUnit.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -21767,7 +21765,6 @@
</span><span class="cx">                                 185BCF270F3279CE000EA262 /* ThreadTimers.h */,
</span><span class="cx">                                 93309EA1099EB78C0056E581 /* Timer.cpp */,
</span><span class="cx">                                 9305B24C098F1B6B00C28855 /* Timer.h */,
</span><del>-                                1419D2C40CEA6F6100FF507A /* TreeShared.h */,
</del><span class="cx">                                 6593923509AE4346002C531F /* URL.cpp */,
</span><span class="cx">                                 6593923609AE4346002C531F /* URL.h */,
</span><span class="cx">                                 BCBD21AA0E417AD400A070F2 /* URLHash.h */,
</span><span class="lines">@@ -26858,7 +26855,6 @@
</span><span class="cx">                                 6F995A241A7078B100A735F4 /* WebGLTransformFeedback.h in Headers */,
</span><span class="cx">                                 14D64B5D134A5B6B00E58FDA /* TreeScope.h in Headers */,
</span><span class="cx">                                 A77E1FF014AACB6E005B7CB6 /* TreeScopeAdopter.h in Headers */,
</span><del>-                                1419D2C50CEA6F6100FF507A /* TreeShared.h in Headers */,
</del><span class="cx">                                 854FE7390A2297BE0058D7AD /* TreeWalker.h in Headers */,
</span><span class="cx">                                 C375D7FE16639519006184AB /* TypeAhead.h in Headers */,
</span><span class="cx">                                 E46A2B1C17CA65B9000DBCD8 /* TypedElementDescendantIterator.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (183008 => 183009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp        2015-04-20 08:31:04 UTC (rev 183008)
+++ trunk/Source/WebCore/dom/Node.cpp        2015-04-20 09:18:26 UTC (rev 183009)
</span><span class="lines">@@ -287,12 +287,15 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> Node::Node(Document&amp; document, ConstructionType type)
</span><del>-    : m_nodeFlags(type)
</del><ins>+    : m_refCount(1)
+    , m_nodeFlags(type)
</ins><span class="cx">     , m_parentNode(nullptr)
</span><span class="cx">     , m_treeScope(&amp;document)
</span><span class="cx">     , m_previous(nullptr)
</span><span class="cx">     , m_next(nullptr)
</span><span class="cx"> {
</span><ins>+    ASSERT(isMainThread());
+
</ins><span class="cx">     document.incrementReferencingNodeCount();
</span><span class="cx"> 
</span><span class="cx"> #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) &amp;&amp; DUMP_NODE_STATISTICS)
</span><span class="lines">@@ -302,6 +305,11 @@
</span><span class="cx"> 
</span><span class="cx"> Node::~Node()
</span><span class="cx"> {
</span><ins>+    ASSERT(isMainThread());
+    ASSERT(!m_refCount);
+    ASSERT(m_deletionHasBegun);
+    ASSERT(!m_adoptionIsRequired);
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     if (!ignoreSet().remove(this))
</span><span class="cx">         nodeCounter.decrement();
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (183008 => 183009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h        2015-04-20 08:31:04 UTC (rev 183008)
+++ trunk/Source/WebCore/dom/Node.h        2015-04-20 09:18:26 UTC (rev 183009)
</span><span class="lines">@@ -32,20 +32,11 @@
</span><span class="cx"> #include &quot;RenderStyleConstants.h&quot;
</span><span class="cx"> #include &quot;ScriptWrappable.h&quot;
</span><span class="cx"> #include &quot;TreeScope.h&quot;
</span><del>-#include &quot;TreeShared.h&quot;
</del><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> #include &lt;wtf/ListHashSet.h&gt;
</span><ins>+#include &lt;wtf/MainThread.h&gt;
</ins><span class="cx"> #include &lt;wtf/TypeCasts.h&gt;
</span><span class="cx"> 
</span><del>-namespace JSC {
-class VM;
-class SlotVisitor;
-}
-
-namespace WTF {
-class AtomicString;
-}
-
</del><span class="cx"> // This needs to be here because Document.h also depends on it.
</span><span class="cx"> #define DUMP_NODE_STATISTICS 0
</span><span class="cx"> 
</span><span class="lines">@@ -120,7 +111,7 @@
</span><span class="cx">     RenderObject* m_renderer;
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-class Node : public EventTarget, public ScriptWrappable, public TreeShared&lt;Node&gt; {
</del><ins>+class Node : public EventTarget, public ScriptWrappable {
</ins><span class="cx">     friend class Document;
</span><span class="cx">     friend class TreeScope;
</span><span class="cx">     friend class TreeScopeAdopter;
</span><span class="lines">@@ -544,9 +535,17 @@
</span><span class="cx">     // Perform the default action for an event.
</span><span class="cx">     virtual void defaultEventHandler(Event*);
</span><span class="cx"> 
</span><del>-    using TreeShared&lt;Node&gt;::ref;
-    using TreeShared&lt;Node&gt;::deref;
</del><ins>+    void ref();
+    void deref();
+    bool hasOneRef() const;
+    int refCount() const;
</ins><span class="cx"> 
</span><ins>+#ifndef NDEBUG
+    bool m_deletionHasBegun { false };
+    bool m_inRemovedLastRefFunction { false };
+    bool m_adoptionIsRequired { true };
+#endif
+
</ins><span class="cx">     virtual EventTargetData* eventTargetData() override final;
</span><span class="cx">     virtual EventTargetData&amp; ensureEventTargetData() override final;
</span><span class="cx"> 
</span><span class="lines">@@ -668,8 +667,6 @@
</span><span class="cx">     void updateAncestorsForStyleRecalc();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    friend class TreeShared&lt;Node&gt;;
-
</del><span class="cx">     virtual PseudoId customPseudoId() const
</span><span class="cx">     {
</span><span class="cx">         ASSERT(hasCustomStyleResolveCallbacks());
</span><span class="lines">@@ -677,7 +674,6 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT void removedLastRef();
</span><del>-    bool hasTreeSharedParent() const { return !!parentNode(); }
</del><span class="cx"> 
</span><span class="cx">     virtual void refEventTarget() override;
</span><span class="cx">     virtual void derefEventTarget() override;
</span><span class="lines">@@ -690,7 +686,9 @@
</span><span class="cx">     Vector&lt;std::unique_ptr&lt;MutationObserverRegistration&gt;&gt;* mutationObserverRegistry();
</span><span class="cx">     HashSet&lt;MutationObserverRegistration*&gt;* transientMutationObserverRegistry();
</span><span class="cx"> 
</span><ins>+    int m_refCount;
</ins><span class="cx">     mutable uint32_t m_nodeFlags;
</span><ins>+
</ins><span class="cx">     ContainerNode* m_parentNode;
</span><span class="cx">     TreeScope* m_treeScope;
</span><span class="cx">     Node* m_previous;
</span><span class="lines">@@ -708,6 +706,53 @@
</span><span class="cx">     void clearIsParsingChildrenFinished() { clearFlag(IsParsingChildrenFinishedFlag); }
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+#ifndef NDEBUG
+inline void adopted(Node* node)
+{
+    if (!node)
+        return;
+    ASSERT(!node-&gt;m_deletionHasBegun);
+    ASSERT(!node-&gt;m_inRemovedLastRefFunction);
+    node-&gt;m_adoptionIsRequired = false;
+}
+#endif
+
+inline void Node::ref()
+{
+    ASSERT(isMainThread());
+    ASSERT(!m_deletionHasBegun);
+    ASSERT(!m_inRemovedLastRefFunction);
+    ASSERT(!m_adoptionIsRequired);
+    ++m_refCount;
+}
+
+inline void Node::deref()
+{
+    ASSERT(isMainThread());
+    ASSERT(m_refCount &gt;= 0);
+    ASSERT(!m_deletionHasBegun);
+    ASSERT(!m_inRemovedLastRefFunction);
+    ASSERT(!m_adoptionIsRequired);
+    if (--m_refCount &lt;= 0 &amp;&amp; !parentNode()) {
+#ifndef NDEBUG
+        m_inRemovedLastRefFunction = true;
+#endif
+        removedLastRef();
+    }
+}
+
+inline bool Node::hasOneRef() const
+{
+    ASSERT(!m_deletionHasBegun);
+    ASSERT(!m_inRemovedLastRefFunction);
+    return m_refCount == 1;
+}
+
+inline int Node::refCount() const
+{
+    return m_refCount;
+}
+
</ins><span class="cx"> // Used in Node::addSubresourceAttributeURLs() and in addSubresourceStyleURLs()
</span><span class="cx"> inline void addSubresourceURL(ListHashSet&lt;URL&gt;&amp; urls, const URL&amp; url)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformTreeSharedh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/TreeShared.h (183008 => 183009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/TreeShared.h        2015-04-20 08:31:04 UTC (rev 183008)
+++ trunk/Source/WebCore/platform/TreeShared.h        2015-04-20 09:18:26 UTC (rev 183009)
</span><span class="lines">@@ -1,129 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007, 2009, 2010, 2012 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.
- *
- */
-
-#ifndef TreeShared_h
-#define TreeShared_h
-
-#include &lt;wtf/Assertions.h&gt;
-#include &lt;wtf/MainThread.h&gt;
-#include &lt;wtf/Noncopyable.h&gt;
-
-namespace WebCore {
-
-#ifndef NDEBUG
-template&lt;typename NodeType&gt; class TreeShared;
-template&lt;typename NodeType&gt; void adopted(TreeShared&lt;NodeType&gt;*);
-#endif
-
-template&lt;typename NodeType&gt; class TreeShared {
-    WTF_MAKE_NONCOPYABLE(TreeShared); WTF_MAKE_FAST_ALLOCATED;
-protected:
-    TreeShared()
-        : m_refCount(1)
-#ifndef NDEBUG
-        , m_adoptionIsRequired(true)
-#endif
-    {
-        ASSERT(isMainThread());
-#ifndef NDEBUG
-        m_deletionHasBegun = false;
-        m_inRemovedLastRefFunction = false;
-#endif
-    }
-
-    ~TreeShared()
-    {
-        ASSERT(isMainThread());
-        ASSERT(!m_refCount);
-        ASSERT(m_deletionHasBegun);
-        ASSERT(!m_adoptionIsRequired);
-    }
-
-public:
-    void ref()
-    {
-        ASSERT(isMainThread());
-        ASSERT(!m_deletionHasBegun);
-        ASSERT(!m_inRemovedLastRefFunction);
-        ASSERT(!m_adoptionIsRequired);
-        ++m_refCount;
-    }
-
-    void deref()
-    {
-        ASSERT(isMainThread());
-        ASSERT(m_refCount &gt;= 0);
-        ASSERT(!m_deletionHasBegun);
-        ASSERT(!m_inRemovedLastRefFunction);
-        ASSERT(!m_adoptionIsRequired);
-        NodeType* thisNode = static_cast&lt;NodeType*&gt;(this);
-        if (--m_refCount &lt;= 0 &amp;&amp; !thisNode-&gt;hasTreeSharedParent()) {
-#ifndef NDEBUG
-            m_inRemovedLastRefFunction = true;
-#endif
-            thisNode-&gt;removedLastRef();
-        }
-    }
-
-    bool hasOneRef() const
-    {
-        ASSERT(!m_deletionHasBegun);
-        ASSERT(!m_inRemovedLastRefFunction);
-        return m_refCount == 1;
-    }
-
-    int refCount() const
-    {
-        return m_refCount;
-    }
-
-#ifndef NDEBUG
-    bool m_deletionHasBegun;
-    bool m_inRemovedLastRefFunction;
-#endif
-
-private:
-#ifndef NDEBUG
-    friend void adopted&lt;&gt;(TreeShared&lt;NodeType&gt;*);
-#endif
-
-    int m_refCount;
-
-#ifndef NDEBUG
-    bool m_adoptionIsRequired;
-#endif
-};
-
-#ifndef NDEBUG
-
-template&lt;typename NodeType&gt; inline void adopted(TreeShared&lt;NodeType&gt;* object)
-{
-    if (!object)
-        return;
-    ASSERT(!object-&gt;m_deletionHasBegun);
-    ASSERT(!object-&gt;m_inRemovedLastRefFunction);
-    object-&gt;m_adoptionIsRequired = false;
-}
-
-#endif
-
-}
-
-#endif // TreeShared.h
</del></span></pre>
</div>
</div>

</body>
</html>