<!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>[164735] trunk/Source</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/164735">164735</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-26 12:15:44 -0800 (Wed, 26 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused InspectorCounters.
<https://webkit.org/b/129367>
The InspectorCounters code was only used to implement two layout test
APIs (window.internals.numberOfLive{Nodes,Documents}) yet it had hooks
in crazy places like Node construction and destruction.
Rewrote the internals APIs to iterate over all live Documents instead,
totaling up their referencing Node count. Added a process-global
Document::allDocuments() HashSet to make this whole thing possible.
Reviewed by Sam Weinig.
* CMakeLists.txt:
* GNUmakefile.list.am:
* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSEventListener.cpp:
* dom/Document.cpp:
(WebCore::Document::allDocuments):
(WebCore::Document::Document):
(WebCore::Document::~Document):
* dom/Document.h:
(WebCore::Node::Node):
* dom/Node.cpp:
(WebCore::Node::~Node):
* inspector/InspectorAllInOne.cpp:
* inspector/InspectorCounters.cpp: Removed.
* inspector/InspectorCounters.h: Removed.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::start):
(WebCore::InspectorTimelineAgent::innerAddRecordToTimeline):
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
* inspector/InspectorTimelineAgent.h:
* inspector/protocol/Timeline.json:
* platform/ThreadGlobalData.cpp:
* testing/Internals.cpp:
(WebCore::Internals::numberOfLiveNodes):
(WebCore::Internals::numberOfLiveDocuments):
* testing/Internals.h:
* testing/Internals.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCorebindingsjsJSEventListenercpp">trunk/Source/WebCore/bindings/js/JSEventListener.cpp</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="#trunkSourceWebCoreinspectorInspectorAllInOnecpp">trunk/Source/WebCore/inspector/InspectorAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolTimelinejson">trunk/Source/WebCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#trunkSourceWebCoreplatformThreadGlobalDatacpp">trunk/Source/WebCore/platform/ThreadGlobalData.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreinspectorInspectorCounterscpp">trunk/Source/WebCore/inspector/InspectorCounters.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCountersh">trunk/Source/WebCore/inspector/InspectorCounters.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -1561,7 +1561,6 @@
</span><span class="cx"> inspector/InspectorCSSAgent.cpp
</span><span class="cx"> inspector/InspectorClient.cpp
</span><span class="cx"> inspector/InspectorController.cpp
</span><del>- inspector/InspectorCounters.cpp
</del><span class="cx"> inspector/InspectorDOMAgent.cpp
</span><span class="cx"> inspector/InspectorDOMDebuggerAgent.cpp
</span><span class="cx"> inspector/InspectorDOMStorageAgent.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/ChangeLog 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2014-02-26 Andreas Kling <akling@apple.com>
+
+ Remove unused InspectorCounters.
+ <https://webkit.org/b/129367>
+
+ The InspectorCounters code was only used to implement two layout test
+ APIs (window.internals.numberOfLive{Nodes,Documents}) yet it had hooks
+ in crazy places like Node construction and destruction.
+
+ Rewrote the internals APIs to iterate over all live Documents instead,
+ totaling up their referencing Node count. Added a process-global
+ Document::allDocuments() HashSet to make this whole thing possible.
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSEventListener.cpp:
+ * dom/Document.cpp:
+ (WebCore::Document::allDocuments):
+ (WebCore::Document::Document):
+ (WebCore::Document::~Document):
+ * dom/Document.h:
+ (WebCore::Node::Node):
+ * dom/Node.cpp:
+ (WebCore::Node::~Node):
+ * inspector/InspectorAllInOne.cpp:
+ * inspector/InspectorCounters.cpp: Removed.
+ * inspector/InspectorCounters.h: Removed.
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::start):
+ (WebCore::InspectorTimelineAgent::innerAddRecordToTimeline):
+ (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/protocol/Timeline.json:
+ * platform/ThreadGlobalData.cpp:
+ * testing/Internals.cpp:
+ (WebCore::Internals::numberOfLiveNodes):
+ (WebCore::Internals::numberOfLiveDocuments):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2014-02-26 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove console.profiles from window.console API
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -3764,8 +3764,6 @@
</span><span class="cx"> Source/WebCore/inspector/InspectorConsoleInstrumentation.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorController.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorController.h \
</span><del>- Source/WebCore/inspector/InspectorCounters.cpp \
- Source/WebCore/inspector/InspectorCounters.h \
</del><span class="cx"> Source/WebCore/inspector/InspectorDOMAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorDOMAgent.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -1212,6 +1212,7 @@
</span><span class="cx"> __ZN7WebCore8BlobData14setContentTypeERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore8CSSValue7destroyEv
</span><span class="cx"> __ZN7WebCore8Document11createRangeEv
</span><ins>+__ZN7WebCore8Document12allDocumentsEv
</ins><span class="cx"> __ZN7WebCore8Document12updateLayoutEv
</span><span class="cx"> __ZN7WebCore8Document13createElementERKNS_13QualifiedNameEb
</span><span class="cx"> __ZN7WebCore8Document14createTextNodeERKN3WTF6StringE
</span><span class="lines">@@ -2836,7 +2837,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> __ZN7WebCore15InspectorClient31doDispatchMessageOnFrontendPageEPNS_4PageERKN3WTF6StringE
</span><del>-__ZN7WebCore17InspectorCounters12counterValueENS0_11CounterTypeE
</del><span class="cx"> __ZN7WebCore19InspectorController15connectFrontendEPN9Inspector24InspectorFrontendChannelE
</span><span class="cx"> __ZN7WebCore19InspectorController18disconnectFrontendEN9Inspector25InspectorDisconnectReasonE
</span><span class="cx"> __ZN7WebCore19InspectorController18setProfilerEnabledEb
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -17501,14 +17501,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InspectorCounters.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorCSSAgent.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -20743,7 +20735,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorClient.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorConsoleInstrumentation.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorController.h" />
</span><del>- <ClInclude Include="..\inspector\InspectorCounters.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorCSSAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorDatabaseAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorDatabaseInstrumentation.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -4743,9 +4743,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\InspectorController.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InspectorCounters.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorCSSAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -12275,9 +12272,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorController.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InspectorCounters.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorCSSAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -6033,8 +6033,6 @@
</span><span class="cx"> F12171F516A8CED2000053CA /* WebVTTElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F12171F316A8BC63000053CA /* WebVTTElement.cpp */; };
</span><span class="cx"> F12171F616A8CF0B000053CA /* WebVTTElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F12171F416A8BC63000053CA /* WebVTTElement.h */; };
</span><span class="cx"> F293B27E56C112F373FFF27E /* DNSResolveQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C60128060078BB70E367A95 /* DNSResolveQueue.cpp */; };
</span><del>- F325A40A14EE36FA007324E2 /* InspectorCounters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F325A40814EE36FA007324E2 /* InspectorCounters.cpp */; };
- F325A40B14EE36FA007324E2 /* InspectorCounters.h in Headers */ = {isa = PBXBuildFile; fileRef = F325A40914EE36FA007324E2 /* InspectorCounters.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> F33F0282120947F200E5743A /* ScriptProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F33F0281120947F200E5743A /* ScriptProfile.cpp */; };
</span><span class="cx"> F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */ = {isa = PBXBuildFile; fileRef = F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -13351,8 +13349,6 @@
</span><span class="cx"> EDEC98020AED7E170059137F /* WebCorePrefix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebCorePrefix.h; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
</span><span class="cx"> F12171F316A8BC63000053CA /* WebVTTElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebVTTElement.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F12171F416A8BC63000053CA /* WebVTTElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVTTElement.h; sourceTree = "<group>"; };
</span><del>- F325A40814EE36FA007324E2 /* InspectorCounters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorCounters.cpp; sourceTree = "<group>"; };
- F325A40914EE36FA007324E2 /* InspectorCounters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCounters.h; sourceTree = "<group>"; };
</del><span class="cx"> F33F0281120947F200E5743A /* ScriptProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptProfile.cpp; sourceTree = "<group>"; };
</span><span class="cx"> F344C7121125B82C00F26EEE /* InspectorFrontendClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendClient.h; sourceTree = "<group>"; };
</span><span class="cx"> F344C75211294D9D00F26EEE /* InspectorFrontendClientLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendClientLocal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -14801,8 +14797,6 @@
</span><span class="cx"> F3F5CF1012ED81A80084C569 /* InspectorConsoleInstrumentation.h */,
</span><span class="cx"> 1C81B9570E97330800266E07 /* InspectorController.cpp */,
</span><span class="cx"> 1C81B9560E97330800266E07 /* InspectorController.h */,
</span><del>- F325A40814EE36FA007324E2 /* InspectorCounters.cpp */,
- F325A40914EE36FA007324E2 /* InspectorCounters.h */,
</del><span class="cx"> 82AB1741124B99EC00C5069D /* InspectorCSSAgent.cpp */,
</span><span class="cx"> 82AB1742124B99EC00C5069D /* InspectorCSSAgent.h */,
</span><span class="cx"> 7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */,
</span><span class="lines">@@ -23913,7 +23907,6 @@
</span><span class="cx"> 1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
</span><span class="cx"> F3F5CF1112ED81A80084C569 /* InspectorConsoleInstrumentation.h in Headers */,
</span><span class="cx"> 1C81B95A0E97330800266E07 /* InspectorController.h in Headers */,
</span><del>- F325A40B14EE36FA007324E2 /* InspectorCounters.h in Headers */,
</del><span class="cx"> 82AB1744124B99EC00C5069D /* InspectorCSSAgent.h in Headers */,
</span><span class="cx"> 4A9CC82116BF9BB400EC645A /* InspectorCSSOMWrappers.h in Headers */,
</span><span class="cx"> 7AB0B1C11211A62200A76940 /* InspectorDatabaseAgent.h in Headers */,
</span><span class="lines">@@ -27275,7 +27268,6 @@
</span><span class="cx"> B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
</span><span class="cx"> 7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
</span><span class="cx"> 1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */,
</span><del>- F325A40A14EE36FA007324E2 /* InspectorCounters.cpp in Sources */,
</del><span class="cx"> 82AB1743124B99EC00C5069D /* InspectorCSSAgent.cpp in Sources */,
</span><span class="cx"> 4A9CC82016BF9BB400EC645A /* InspectorCSSOMWrappers.cpp in Sources */,
</span><span class="cx"> 7AB0B1C01211A62200A76940 /* InspectorDatabaseAgent.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSEventListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSEventListener.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/bindings/js/JSEventListener.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include "BeforeUnloadEvent.h"
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "Frame.h"
</span><del>-#include "InspectorCounters.h"
</del><span class="cx"> #include "JSEvent.h"
</span><span class="cx"> #include "JSEventTarget.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -392,6 +392,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+HashSet<Document*>& Document::allDocuments()
+{
+ static NeverDestroyed<HashSet<Document*>> documents;
+ return documents;
+}
+
</ins><span class="cx"> Document::Document(Frame* frame, const URL& url, unsigned documentClasses, unsigned constructionFlags)
</span><span class="cx"> : ContainerNode(*this, CreateDocument)
</span><span class="cx"> , TreeScope(*this)
</span><span class="lines">@@ -508,6 +514,8 @@
</span><span class="cx"> , m_hasInjectedPlugInsScript(false)
</span><span class="cx"> , m_renderTreeBeingDestroyed(false)
</span><span class="cx"> {
</span><ins>+ allDocuments().add(this);
+
</ins><span class="cx"> // We depend on the url getting immediately set in subframes, but we
</span><span class="cx"> // also depend on the url NOT getting immediately set in opened windows.
</span><span class="cx"> // See fast/dom/early-frame-url.html
</span><span class="lines">@@ -535,8 +543,6 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < WTF_ARRAY_LENGTH(m_nodeListAndCollectionCounts); ++i)
</span><span class="cx"> m_nodeListAndCollectionCounts[i] = 0;
</span><del>-
- InspectorCounters::incrementCounter(InspectorCounters::DocumentCounter);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void histogramMutationEventUsage(const unsigned short& listenerTypes)
</span><span class="lines">@@ -571,6 +577,8 @@
</span><span class="cx">
</span><span class="cx"> Document::~Document()
</span><span class="cx"> {
</span><ins>+ allDocuments().remove(this);
+
</ins><span class="cx"> ASSERT(!renderView());
</span><span class="cx"> ASSERT(!m_inPageCache);
</span><span class="cx"> ASSERT(m_ranges.isEmpty());
</span><span class="lines">@@ -636,8 +644,6 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < WTF_ARRAY_LENGTH(m_nodeListAndCollectionCounts); ++i)
</span><span class="cx"> ASSERT(!m_nodeListAndCollectionCounts[i]);
</span><del>-
- InspectorCounters::decrementCounter(InspectorCounters::DocumentCounter);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::removedLastRef()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/dom/Document.h 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "FocusDirection.h"
</span><span class="cx"> #include "HitTestRequest.h"
</span><span class="cx"> #include "IconURL.h"
</span><del>-#include "InspectorCounters.h"
</del><span class="cx"> #include "MutationObserver.h"
</span><span class="cx"> #include "PageVisibilityState.h"
</span><span class="cx"> #include "PlatformScreen.h"
</span><span class="lines">@@ -287,8 +286,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ unsigned referencingNodeCount() const { return m_referencingNodeCount; }
+
</ins><span class="cx"> void removedLastRef();
</span><span class="cx">
</span><ins>+ static HashSet<Document*>& allDocuments();
+
</ins><span class="cx"> MediaQueryMatcher& mediaQueryMatcher();
</span><span class="cx">
</span><span class="cx"> using ContainerNode::ref;
</span><span class="lines">@@ -1725,8 +1728,6 @@
</span><span class="cx"> #if !defined(NDEBUG) || (defined(DUMP_NODE_STATISTICS) && DUMP_NODE_STATISTICS)
</span><span class="cx"> trackForDebugging();
</span><span class="cx"> #endif
</span><del>-
- InspectorCounters::incrementCounter(InspectorCounters::NodeCounter);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ScriptExecutionContext* Node::scriptExecutionContext() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/dom/Node.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -309,8 +309,6 @@
</span><span class="cx"> willBeDeletedFrom(document());
</span><span class="cx">
</span><span class="cx"> document().decrementReferencingNodeCount();
</span><del>-
- InspectorCounters::decrementCounter(InspectorCounters::NodeCounter);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Node::willBeDeletedFrom(Document& document)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "InspectorCSSAgent.cpp"
</span><span class="cx"> #include "InspectorClient.cpp"
</span><span class="cx"> #include "InspectorController.cpp"
</span><del>-#include "InspectorCounters.cpp"
</del><span class="cx"> #include "InspectorDOMAgent.cpp"
</span><span class="cx"> #include "InspectorDOMDebuggerAgent.cpp"
</span><span class="cx"> #include "InspectorDOMStorageAgent.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCounterscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorCounters.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCounters.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/inspector/InspectorCounters.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -1,48 +0,0 @@
</span><del>-/*
-* Copyright (C) 2012 Google Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are
-* met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following disclaimer
-* in the documentation and/or other materials provided with the
-* distribution.
-* * Neither the name of Google Inc. nor the names of its
-* contributors may be used to endorse or promote products derived from
-* this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include "config.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorCounters.h"
-
-namespace WebCore {
-
-int InspectorCounters::s_counters[CounterTypeLength];
-
-int InspectorCounters::counterValue(CounterType type)
-{
- return s_counters[type];
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCountersh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorCounters.h (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCounters.h 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/inspector/InspectorCounters.h 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-/*
-* Copyright (C) 2012 Google Inc. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are
-* met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above
-* copyright notice, this list of conditions and the following disclaimer
-* in the documentation and/or other materials provided with the
-* distribution.
-* * Neither the name of Google Inc. nor the names of its
-* contributors may be used to endorse or promote products derived from
-* this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef InspectorCounters_h
-#define InspectorCounters_h
-
-#include <wtf/FastMalloc.h>
-
-#if !ASSERT_DISABLED
-#include <wtf/MainThread.h>
-#if PLATFORM(IOS)
-#include "WebCoreThread.h"
-#endif
-#endif
-
-namespace WebCore {
-
-class InspectorCounters {
-public:
- enum CounterType {
- DocumentCounter,
- NodeCounter,
- JSEventListenerCounter,
- CounterTypeLength
- };
-
- static inline void incrementCounter(CounterType type)
- {
-#if ENABLE(INSPECTOR)
- ASSERT(isMainThread());
- ++s_counters[type];
-#else
- UNUSED_PARAM(type);
-#endif
- }
-
- static inline void decrementCounter(CounterType type)
- {
-#if ENABLE(INSPECTOR)
- ASSERT(isMainThread());
- --s_counters[type];
-#else
- UNUSED_PARAM(type);
-#endif
- }
-
-#if ENABLE(INSPECTOR)
- static int counterValue(CounterType);
-#endif
-
-private:
- InspectorCounters();
-
-#if ENABLE(INSPECTOR)
- static int s_counters[CounterTypeLength];
-#endif
-};
-
-} // namespace WebCore
-
-#endif // !defined(InspectorCounters_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><del>-#include "InspectorCounters.h"
</del><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="lines">@@ -82,7 +81,7 @@
</span><span class="cx"> stop(&error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters)
</del><ins>+void InspectorTimelineAgent::start(ErrorString*, const int* maxCallStackDepth)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_frontendDispatcher)
</span><span class="cx"> return;
</span><span class="lines">@@ -92,9 +91,6 @@
</span><span class="cx"> else
</span><span class="cx"> m_maxCallStackDepth = 5;
</span><span class="cx">
</span><del>- if (includeDomCounters)
- m_includeDOMCounters = *includeDomCounters;
-
</del><span class="cx"> m_timeConverter.reset();
</span><span class="cx">
</span><span class="cx"> m_instrumentingAgents->setInspectorTimelineAgent(this);
</span><span class="lines">@@ -556,8 +552,6 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::TypeBuilder::Timeline::TimelineEvent> record = Inspector::TypeBuilder::Timeline::TimelineEvent::runtimeCast(prpRecord);
</span><span class="cx">
</span><del>- setDOMCounters(record.get());
-
</del><span class="cx"> if (m_recordStack.isEmpty())
</span><span class="cx"> sendEvent(record.release());
</span><span class="cx"> else {
</span><span class="lines">@@ -571,24 +565,6 @@
</span><span class="cx"> return JSDOMWindow::commonVM()->heap.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::setDOMCounters(Inspector::TypeBuilder::Timeline::TimelineEvent* record)
-{
- record->setUsedHeapSize(usedHeapSize());
-
- if (m_includeDOMCounters) {
- int documentCount = 0;
- int nodeCount = 0;
- if (m_inspectorType == PageInspector) {
- documentCount = InspectorCounters::counterValue(InspectorCounters::DocumentCounter);
- nodeCount = InspectorCounters::counterValue(InspectorCounters::NodeCounter);
- }
- RefPtr<Inspector::TypeBuilder::Timeline::DOMCounters> counters = Inspector::TypeBuilder::Timeline::DOMCounters::create()
- .setDocuments(documentCount)
- .setNodes(nodeCount);
- record->setCounters(counters.release());
- }
-}
-
</del><span class="cx"> void InspectorTimelineAgent::setFrameIdentifier(InspectorObject* record, Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> if (!frame || !m_pageAgent)
</span><span class="lines">@@ -626,7 +602,6 @@
</span><span class="cx"> , m_client(client)
</span><span class="cx"> , m_weakFactory(this)
</span><span class="cx"> , m_enabled(false)
</span><del>- , m_includeDOMCounters(false)
</del><span class="cx"> , m_recordingProfile(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
</span><span class="cx"> virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
</span><span class="cx">
</span><del>- virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* includeDomCounters) override;
</del><ins>+ virtual void start(ErrorString*, const int* maxCallStackDepth) override;
</ins><span class="cx"> virtual void stop(ErrorString*) override;
</span><span class="cx"> virtual void canMonitorMainThread(ErrorString*, bool*) override;
</span><span class="cx"> virtual void supportsFrameInstrumentation(ErrorString*, bool*) override;
</span><span class="lines">@@ -230,7 +230,6 @@
</span><span class="cx"> void appendRecord(PassRefPtr<Inspector::InspectorObject> data, TimelineRecordType, bool captureCallStack, Frame*);
</span><span class="cx"> void pushCurrentRecord(PassRefPtr<Inspector::InspectorObject>, TimelineRecordType, bool captureCallStack, Frame*);
</span><span class="cx">
</span><del>- void setDOMCounters(Inspector::TypeBuilder::Timeline::TimelineEvent* record);
</del><span class="cx"> void setFrameIdentifier(Inspector::InspectorObject* record, Frame*);
</span><span class="cx">
</span><span class="cx"> void didCompleteCurrentRecord(TimelineRecordType);
</span><span class="lines">@@ -264,7 +263,6 @@
</span><span class="cx"> WeakPtrFactory<InspectorTimelineAgent> m_weakFactory;
</span><span class="cx">
</span><span class="cx"> bool m_enabled;
</span><del>- bool m_includeDOMCounters;
</del><span class="cx"> bool m_recordingProfile;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Timeline.json (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Timeline.json 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/inspector/protocol/Timeline.json 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -3,15 +3,6 @@
</span><span class="cx"> "description": "Timeline provides its clients with instrumentation records that are generated during the page runtime. Timeline instrumentation can be started and stopped using corresponding commands. While timeline is started, it is generating timeline event records.",
</span><span class="cx"> "types": [
</span><span class="cx"> {
</span><del>- "id": "DOMCounters",
- "type": "object",
- "properties": [
- { "name": "documents", "type": "integer" },
- { "name": "nodes", "type": "integer" }
- ],
- "description": "Current values of DOM counters."
- },
- {
</del><span class="cx"> "id": "EventType",
</span><span class="cx"> "type": "string",
</span><span class="cx"> "enum": ["EventDispatch", "BeginFrame", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "CompositeLayers", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</span><span class="lines">@@ -25,7 +16,6 @@
</span><span class="cx"> { "name": "thread", "type": "string", "optional": true, "description": "If present, identifies the thread that produced the event." },
</span><span class="cx"> { "name": "data", "type": "object", "description": "Event data." },
</span><span class="cx"> { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." },
</span><del>- { "name": "counters", "$ref": "DOMCounters", "optional": true, "description": "Current values of DOM counters." },
</del><span class="cx"> { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Timeline record contains information about the recorded activity."
</span><span class="lines">@@ -35,8 +25,7 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "start",
</span><span class="cx"> "parameters": [
</span><del>- { "name": "maxCallStackDepth", "optional": true, "type": "integer", "description": "Samples JavaScript stack traces up to <code>maxCallStackDepth</code>, defaults to 5." },
- { "name": "includeDomCounters", "optional": true, "type": "boolean", "description": "Whether DOM counters data should be included into timeline events." }
</del><ins>+ { "name": "maxCallStackDepth", "optional": true, "type": "integer", "description": "Samples JavaScript stack traces up to <code>maxCallStackDepth</code>, defaults to 5." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Starts capturing instrumentation events."
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThreadGlobalDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ThreadGlobalData.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/platform/ThreadGlobalData.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CachedResourceRequestInitiators.h"
</span><span class="cx"> #include "EventNames.h"
</span><del>-#include "InspectorCounters.h"
</del><span class="cx"> #include "TextCodecICU.h"
</span><span class="cx"> #include "ThreadTimers.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> #include "HistoryItem.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorController.h"
</span><del>-#include "InspectorCounters.h"
</del><span class="cx"> #include "InspectorForwarding.h"
</span><span class="cx"> #include "InspectorFrontendClientLocal.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="lines">@@ -1441,17 +1440,20 @@
</span><span class="cx"> return contextDocument()->domWindow()->console()->profiles();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(INSPECTOR)
</del><span class="cx"> unsigned Internals::numberOfLiveNodes() const
</span><span class="cx"> {
</span><del>- return InspectorCounters::counterValue(InspectorCounters::NodeCounter);
</del><ins>+ unsigned nodeCount = 0;
+ for (auto* document : Document::allDocuments())
+ nodeCount += document->referencingNodeCount();
+ return nodeCount;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned Internals::numberOfLiveDocuments() const
</span><span class="cx"> {
</span><del>- return InspectorCounters::counterValue(InspectorCounters::DocumentCounter);
</del><ins>+ return Document::allDocuments().size();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> Vector<String> Internals::consoleMessageArgumentCounts() const
</span><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/testing/Internals.h 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -226,9 +226,10 @@
</span><span class="cx">
</span><span class="cx"> const ProfilesArray& consoleProfiles() const;
</span><span class="cx">
</span><del>-#if ENABLE(INSPECTOR)
</del><span class="cx"> unsigned numberOfLiveNodes() const;
</span><span class="cx"> unsigned numberOfLiveDocuments() const;
</span><ins>+
+#if ENABLE(INSPECTOR)
</ins><span class="cx"> Vector<String> consoleMessageArgumentCounts() const;
</span><span class="cx"> PassRefPtr<DOMWindow> openDummyInspectorFrontend(const String& url);
</span><span class="cx"> void closeDummyInspectorFrontend();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -191,8 +191,8 @@
</span><span class="cx"> // FIXME: this will lead to BUG interals.consoleProfiles !== interals.consoleProfiles as profile will always returns new array.
</span><span class="cx"> readonly attribute ScriptProfile[] consoleProfiles;
</span><span class="cx">
</span><del>- [Conditional=INSPECTOR] unsigned long numberOfLiveNodes();
- [Conditional=INSPECTOR] unsigned long numberOfLiveDocuments();
</del><ins>+ unsigned long numberOfLiveNodes();
+ unsigned long numberOfLiveDocuments();
</ins><span class="cx"> [Conditional=INSPECTOR] sequence<DOMString> consoleMessageArgumentCounts();
</span><span class="cx"> [Conditional=INSPECTOR] DOMWindow openDummyInspectorFrontend(DOMString url);
</span><span class="cx"> [Conditional=INSPECTOR] void closeDummyInspectorFrontend();
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (164734 => 164735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-02-26 20:13:22 UTC (rev 164734)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-02-26 20:15:44 UTC (rev 164735)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx"> symbolWithPointer(?broadcast@ThreadCondition@WTF@@QAEXXZ, ?broadcast@ThreadCondition@WTF@@QEAAXXZ)
</span><span class="cx"> symbolWithPointer(?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z, ?callOnMainThread@WTF@@YAXP6AXPEAX@Z0@Z)
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- ?counterValue@InspectorCounters@WebCore@@SAHW4CounterType@12@@Z
</del><span class="cx"> symbolWithPointer(?didBeginFrame@InspectorController@WebCore@@QAEXXZ, ?didBeginFrame@InspectorController@WebCore@@QEAAXXZ)
</span><span class="cx"> symbolWithPointer(?didCancelFrame@InspectorController@WebCore@@QAEXXZ, ?didCancelFrame@InspectorController@WebCore@@QEAAXXZ)
</span><span class="cx"> #endif
</span><span class="lines">@@ -171,6 +170,7 @@
</span><span class="cx"> symbolWithPointer(??0String@WTF@@QAE@PB_WI@Z, ??0String@WTF@@QEAA@PEB_WI@Z)
</span><span class="cx"> symbolWithPointer(??0String@WTF@@QAE@VASCIILiteral@1@@Z, ??0String@WTF@@QEAA@VASCIILiteral@1@@Z)
</span><span class="cx"> symbolWithPointer(??1SerializedScriptValue@WebCore@@QAE@XZ, ??1SerializedScriptValue@WebCore@@QEAA@XZ)
</span><ins>+ symbolWithPointer(?allDocuments@Document@WebCore@@SAAAV?$HashSet@PAVDocument@WebCore@@U?$PtrHash@PAVDocument@WebCore@@@WTF@@U?$HashTraits@PAVDocument@WebCore@@@4@@WTF@@XZ)
</ins><span class="cx"> symbolWithPointer(?absoluteBoundingBoxRect@RenderObject@WebCore@@QBE?AVIntRect@2@_N@Z, ?absoluteBoundingBoxRect@RenderObject@WebCore@@QEBA?AVIntRect@2@_N@Z)
</span><span class="cx"> symbolWithPointer(?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QBE?AVIntRect@2@XZ, ?absoluteBoundingBoxRectIgnoringTransforms@RenderObject@WebCore@@QEBA?AVIntRect@2@XZ)
</span><span class="cx"> symbolWithPointer(?description@DocumentMarker@WebCore@@QBEABVString@WTF@@XZ, ?description@DocumentMarker@WebCore@@QEBAAEBVString@WTF@@XZ)
</span></span></pre>
</div>
</div>
</body>
</html>