<!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>[164637] 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/164637">164637</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-25 00:19:25 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prune dead code for Web Inspector memory instrumentation.
<https://webkit.org/b/129286>
Source/WebCore:
This was leftover code from Chromium's inspector. It's not used by
today's WebKit inspector.
Reviewed by Sam Weinig.
* CMakeLists.txt:
* DerivedSources.make:
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* inspector/InspectorAllInOne.cpp:
* inspector/InspectorController.cpp:
(WebCore::InspectorController::InspectorController):
* inspector/InspectorController.h:
* inspector/InspectorMemoryAgent.cpp: Removed.
* inspector/InspectorMemoryAgent.h: Removed.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
* inspector/InspectorTimelineAgent.h:
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* inspector/protocol/Memory.json: Removed.
Source/WebInspectorUI:
Reviewed by Sam Weinig.
* UserInterface/Protocol/InspectorWebBackendCommands.js:</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="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefileam">trunk/Source/WebCore/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</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="#trunkSourceWebCoreinspectorInspectorAllInOnecpp">trunk/Source/WebCore/inspector/InspectorAllInOne.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllerh">trunk/Source/WebCore/inspector/InspectorController.h</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="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreinspectorInspectorMemoryAgentcpp">trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorMemoryAgenth">trunk/Source/WebCore/inspector/InspectorMemoryAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolMemoryjson">trunk/Source/WebCore/inspector/protocol/Memory.json</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -761,7 +761,6 @@
</span><span class="cx"> inspector/protocol/IndexedDB.json
</span><span class="cx"> inspector/protocol/Input.json
</span><span class="cx"> inspector/protocol/LayerTree.json
</span><del>- inspector/protocol/Memory.json
</del><span class="cx"> inspector/protocol/Network.json
</span><span class="cx"> inspector/protocol/Page.json
</span><span class="cx"> inspector/protocol/Profiler.json
</span><span class="lines">@@ -1577,7 +1576,6 @@
</span><span class="cx"> inspector/InspectorInstrumentation.cpp
</span><span class="cx"> inspector/InspectorInstrumentationCookie.cpp
</span><span class="cx"> inspector/InspectorLayerTreeAgent.cpp
</span><del>- inspector/InspectorMemoryAgent.cpp
</del><span class="cx"> inspector/InspectorNodeFinder.cpp
</span><span class="cx"> inspector/InspectorOverlay.cpp
</span><span class="cx"> inspector/InspectorPageAgent.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-02-25 Andreas Kling <akling@apple.com>
+
+ Prune dead code for Web Inspector memory instrumentation.
+ <https://webkit.org/b/129286>
+
+ This was leftover code from Chromium's inspector. It's not used by
+ today's WebKit inspector.
+
+ Reviewed by Sam Weinig.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/InspectorAllInOne.cpp:
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::InspectorController):
+ * inspector/InspectorController.h:
+ * inspector/InspectorMemoryAgent.cpp: Removed.
+ * inspector/InspectorMemoryAgent.h: Removed.
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::InspectorTimelineAgent):
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ * inspector/protocol/Memory.json: Removed.
+
</ins><span class="cx"> 2014-02-24 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Support abbr, acronym
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/DerivedSources.make 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -1106,7 +1106,6 @@
</span><span class="cx"> $(WebCore)/inspector/protocol/IndexedDB.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Input.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/LayerTree.json \
</span><del>- $(WebCore)/inspector/protocol/Memory.json \
</del><span class="cx"> $(WebCore)/inspector/protocol/Network.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Page.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Profiler.json \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.am (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.am 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/GNUmakefile.am 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -350,7 +350,6 @@
</span><span class="cx"> $(WebCore)/inspector/protocol/IndexedDB.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Input.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/LayerTree.json \
</span><del>- $(WebCore)/inspector/protocol/Memory.json \
</del><span class="cx"> $(WebCore)/inspector/protocol/Network.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Page.json \
</span><span class="cx"> $(WebCore)/inspector/protocol/Profiler.json \
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -3797,8 +3797,6 @@
</span><span class="cx"> Source/WebCore/inspector/InspectorInstrumentationCookie.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorLayerTreeAgent.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorLayerTreeAgent.h \
</span><del>- Source/WebCore/inspector/InspectorMemoryAgent.cpp \
- Source/WebCore/inspector/InspectorMemoryAgent.h \
</del><span class="cx"> Source/WebCore/inspector/InspectorNodeFinder.cpp \
</span><span class="cx"> Source/WebCore/inspector/InspectorNodeFinder.h \
</span><span class="cx"> Source/WebCore/inspector/InspectorOverlay.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -17628,14 +17628,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\InspectorMemoryAgent.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\InspectorNodeFinder.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">@@ -20769,7 +20761,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorInstrumentation.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorInstrumentationCookie.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorLayerTreeAgent.h" />
</span><del>- <ClInclude Include="..\inspector\InspectorMemoryAgent.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorNodeFinder.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorOverlay.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorPageAgent.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -4791,9 +4791,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\InspectorLayerTreeAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\InspectorMemoryAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\InspectorOverlay.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -12335,9 +12332,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\InspectorLayerTreeAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\InspectorMemoryAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\InspectorNodeFinder.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 (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -2281,8 +2281,6 @@
</span><span class="cx"> 7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */; };
</span><span class="cx"> 7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */; };
</span><span class="cx"> 7A74ECBD101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */; };
</span><del>- 7AA51DD5148506A900AD2752 /* InspectorMemoryAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AA51DD3148506A900AD2752 /* InspectorMemoryAgent.cpp */; };
- 7AA51DD6148506A900AD2752 /* InspectorMemoryAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AA51DD4148506A900AD2752 /* InspectorMemoryAgent.h */; };
</del><span class="cx"> 7AABA25914BC613300AA9A11 /* DOMEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AABA25714BC613300AA9A11 /* DOMEditor.cpp */; };
</span><span class="cx"> 7AABA25A14BC613300AA9A11 /* DOMEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 7AABA25814BC613300AA9A11 /* DOMEditor.h */; };
</span><span class="cx"> 7AB0B1C01211A62200A76940 /* InspectorDatabaseAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */; };
</span><span class="lines">@@ -9229,8 +9227,6 @@
</span><span class="cx"> 7A74ECB8101839A500BF939E /* InspectorDOMStorageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMStorageAgent.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7A74ECB9101839A600BF939E /* InspectorDOMStorageAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMStorageAgent.h; sourceTree = "<group>"; };
</span><span class="cx"> 7A74ECBC101839DA00BF939E /* JSInspectorFrontendHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHostCustom.cpp; sourceTree = "<group>"; };
</span><del>- 7AA51DD3148506A900AD2752 /* InspectorMemoryAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorMemoryAgent.cpp; sourceTree = "<group>"; };
- 7AA51DD4148506A900AD2752 /* InspectorMemoryAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorMemoryAgent.h; sourceTree = "<group>"; };
</del><span class="cx"> 7AABA25714BC613300AA9A11 /* DOMEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMEditor.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7AABA25814BC613300AA9A11 /* DOMEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMEditor.h; sourceTree = "<group>"; };
</span><span class="cx"> 7AB0B1BE1211A62200A76940 /* InspectorDatabaseAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDatabaseAgent.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -14839,8 +14835,6 @@
</span><span class="cx"> A5840E1B187B74D500843B10 /* InspectorInstrumentationCookie.h */,
</span><span class="cx"> 71B1E123164048CC00B1880A /* InspectorLayerTreeAgent.cpp */,
</span><span class="cx"> 71B1E124164048CC00B1880A /* InspectorLayerTreeAgent.h */,
</span><del>- 7AA51DD3148506A900AD2752 /* InspectorMemoryAgent.cpp */,
- 7AA51DD4148506A900AD2752 /* InspectorMemoryAgent.h */,
</del><span class="cx"> 504AACCB1834455900E3D9BC /* InspectorNodeFinder.cpp */,
</span><span class="cx"> 504AACCC1834455900E3D9BC /* InspectorNodeFinder.h */,
</span><span class="cx"> 7C522D4915B477E8009B7C95 /* InspectorOverlay.cpp */,
</span><span class="lines">@@ -23938,7 +23932,6 @@
</span><span class="cx"> 20D629271253690B00081543 /* InspectorInstrumentation.h in Headers */,
</span><span class="cx"> A5840E1D187B74D500843B10 /* InspectorInstrumentationCookie.h in Headers */,
</span><span class="cx"> 71B1E125164048F700B1880A /* InspectorLayerTreeAgent.h in Headers */,
</span><del>- 7AA51DD6148506A900AD2752 /* InspectorMemoryAgent.h in Headers */,
</del><span class="cx"> 504AACCE1834455900E3D9BC /* InspectorNodeFinder.h in Headers */,
</span><span class="cx"> 0F03C0751884805500A5F8CA /* InspectorOverlay.h in Headers */,
</span><span class="cx"> 4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */,
</span><span class="lines">@@ -27295,7 +27288,6 @@
</span><span class="cx"> 20D629261253690B00081543 /* InspectorInstrumentation.cpp in Sources */,
</span><span class="cx"> A5840E1C187B74D500843B10 /* InspectorInstrumentationCookie.cpp in Sources */,
</span><span class="cx"> 71B1E1261640491A00B1880A /* InspectorLayerTreeAgent.cpp in Sources */,
</span><del>- 7AA51DD5148506A900AD2752 /* InspectorMemoryAgent.cpp in Sources */,
</del><span class="cx"> 504AACCD1834455900E3D9BC /* InspectorNodeFinder.cpp in Sources */,
</span><span class="cx"> 7C522D4B15B477E8009B7C95 /* InspectorOverlay.cpp in Sources */,
</span><span class="cx"> 4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> #include "InspectorInstrumentation.cpp"
</span><span class="cx"> #include "InspectorInstrumentationCookie.cpp"
</span><span class="cx"> #include "InspectorLayerTreeAgent.cpp"
</span><del>-#include "InspectorMemoryAgent.cpp"
</del><span class="cx"> #include "InspectorNodeFinder.cpp"
</span><span class="cx"> #include "InspectorOverlay.cpp"
</span><span class="cx"> #include "InspectorPageAgent.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> #include "InspectorInputAgent.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "InspectorLayerTreeAgent.h"
</span><del>-#include "InspectorMemoryAgent.h"
</del><span class="cx"> #include "InspectorOverlay.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InspectorProfilerAgent.h"
</span><span class="lines">@@ -129,11 +128,7 @@
</span><span class="cx"> InspectorDOMStorageAgent* domStorageAgent = domStorageAgentPtr.get();
</span><span class="cx"> m_agents.append(std::move(domStorageAgentPtr));
</span><span class="cx">
</span><del>- auto memoryAgentPtr = std::make_unique<InspectorMemoryAgent>(m_instrumentingAgents.get());
- m_memoryAgent = memoryAgentPtr.get();
- m_agents.append(std::move(memoryAgentPtr));
-
- m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), pageAgent, m_memoryAgent, InspectorTimelineAgent::PageInspector, inspectorClient));
</del><ins>+ m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), pageAgent, InspectorTimelineAgent::PageInspector, inspectorClient));
</ins><span class="cx"> m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(m_instrumentingAgents.get(), pageAgent));
</span><span class="cx">
</span><span class="cx"> auto resourceAgentPtr = std::make_unique<InspectorResourceAgent>(m_instrumentingAgents.get(), pageAgent, inspectorClient);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> class InspectorDOMAgent;
</span><span class="cx"> class InspectorDOMDebuggerAgent;
</span><span class="cx"> class InspectorFrontendClient;
</span><del>-class InspectorMemoryAgent;
</del><span class="cx"> class InspectorOverlay;
</span><span class="cx"> class InspectorPageAgent;
</span><span class="cx"> class InspectorProfilerAgent;
</span><span class="lines">@@ -149,7 +148,6 @@
</span><span class="cx"> InspectorDOMAgent* m_domAgent;
</span><span class="cx"> InspectorResourceAgent* m_resourceAgent;
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><del>- InspectorMemoryAgent* m_memoryAgent;
</del><span class="cx"> Inspector::InspectorDebuggerAgent* m_debuggerAgent;
</span><span class="cx"> InspectorDOMDebuggerAgent* m_domDebuggerAgent;
</span><span class="cx"> InspectorProfilerAgent* m_profilerAgent;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorMemoryAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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 "InspectorMemoryAgent.h"
-
-#include "CharacterData.h"
-#include "Document.h"
-#include "EventListenerMap.h"
-#include "Frame.h"
-#include "InspectorDOMStorageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
-#include "InstrumentingAgents.h"
-#include "MemoryCache.h"
-#include "Node.h"
-#include "NodeTraversal.h"
-#include "ScriptProfiler.h"
-#include "StyledElement.h"
-#include <inspector/InspectorValues.h>
-#include <runtime/ArrayBufferView.h>
-#include <wtf/HashSet.h>
-#include <wtf/Vector.h>
-#include <wtf/text/StringBuilder.h>
-#include <wtf/text/StringImpl.h>
-#include <wtf/text/WTFString.h>
-
-// Use a type alias instead of 'using' here which would cause a conflict on Mac.
-typedef Inspector::TypeBuilder::Memory::MemoryBlock InspectorMemoryBlock;
-typedef Inspector::TypeBuilder::Array<InspectorMemoryBlock> InspectorMemoryBlocks;
-
-using namespace Inspector;
-
-namespace WebCore {
-
-InspectorMemoryAgent::~InspectorMemoryAgent()
-{
-}
-
-void InspectorMemoryAgent::didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, InspectorBackendDispatcher* backendDispatcher)
-{
- m_backendDispatcher = InspectorMemoryBackendDispatcher::create(backendDispatcher, this);
-}
-
-void InspectorMemoryAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason)
-{
- m_backendDispatcher.clear();
-}
-
-void InspectorMemoryAgent::getDOMCounters(ErrorString*, int* documents, int* nodes, int* jsEventListeners)
-{
- *documents = InspectorCounters::counterValue(InspectorCounters::DocumentCounter);
- *nodes = InspectorCounters::counterValue(InspectorCounters::NodeCounter);
- *jsEventListeners = ThreadLocalInspectorCounters::current().counterValue(ThreadLocalInspectorCounters::JSEventListenerCounter);
-}
-
-InspectorMemoryAgent::InspectorMemoryAgent(InstrumentingAgents* instrumentingAgents)
- : InspectorAgentBase(ASCIILiteral("Memory"), instrumentingAgents)
-{
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorMemoryAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/InspectorMemoryAgent.h (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorMemoryAgent.h 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/InspectorMemoryAgent.h 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -1,65 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 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 InspectorMemoryAgent_h
-#define InspectorMemoryAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class InspectorDOMStorageAgent;
-class InstrumentingAgents;
-
-typedef String ErrorString;
-
-class InspectorMemoryAgent : public InspectorAgentBase, public Inspector::InspectorMemoryBackendDispatcherHandler {
- WTF_MAKE_NONCOPYABLE(InspectorMemoryAgent);
-public:
- explicit InspectorMemoryAgent(InstrumentingAgents*);
- virtual ~InspectorMemoryAgent();
-
- virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
- virtual void willDestroyFrontendAndBackend(Inspector::InspectorDisconnectReason) override;
-
- virtual void getDOMCounters(ErrorString*, int* documents, int* nodes, int* jsEventListeners) override;
-
-private:
- RefPtr<Inspector::InspectorMemoryBackendDispatcher> m_backendDispatcher;
-};
-
-} // namespace WebCore
-
-#endif // !ENABLE(INSPECTOR)
-#endif // !defined(InspectorMemoryAgent_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorCounters.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><del>-#include "InspectorMemoryAgent.h"
</del><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="cx"> #include "InspectorWebFrontendDispatchers.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><span class="lines">@@ -620,10 +619,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorTimelineAgent::InspectorTimelineAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorMemoryAgent* memoryAgent, InspectorType type, InspectorClient* client)
</del><ins>+InspectorTimelineAgent::InspectorTimelineAgent(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorType type, InspectorClient* client)
</ins><span class="cx"> : InspectorAgentBase(ASCIILiteral("Timeline"), instrumentingAgents)
</span><span class="cx"> , m_pageAgent(pageAgent)
</span><del>- , m_memoryAgent(memoryAgent)
</del><span class="cx"> , m_id(1)
</span><span class="cx"> , m_maxCallStackDepth(5)
</span><span class="cx"> , m_inspectorType(type)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class FloatQuad;
</span><span class="cx"> class Frame;
</span><span class="cx"> class InspectorClient;
</span><del>-class InspectorMemoryAgent;
</del><span class="cx"> class InspectorPageAgent;
</span><span class="cx"> class InstrumentingAgents;
</span><span class="cx"> class IntRect;
</span><span class="lines">@@ -127,7 +126,7 @@
</span><span class="cx"> public:
</span><span class="cx"> enum InspectorType { PageInspector, WorkerInspector };
</span><span class="cx">
</span><del>- InspectorTimelineAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorMemoryAgent*, InspectorType, InspectorClient*);
</del><ins>+ InspectorTimelineAgent(InstrumentingAgents*, InspectorPageAgent*, InspectorType, InspectorClient*);
</ins><span class="cx"> ~InspectorTimelineAgent();
</span><span class="cx">
</span><span class="cx"> virtual void didCreateFrontendAndBackend(Inspector::InspectorFrontendChannel*, Inspector::InspectorBackendDispatcher*) override;
</span><span class="lines">@@ -249,7 +248,6 @@
</span><span class="cx"> Page* page();
</span><span class="cx">
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><del>- InspectorMemoryAgent* m_memoryAgent;
</del><span class="cx"> TimelineTimeConverter m_timeConverter;
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Inspector::InspectorTimelineFrontendDispatcher> m_frontendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx">
</span><span class="cx"> m_agents.append(InspectorProfilerAgent::create(m_instrumentingAgents.get(), consoleAgent.get(), &workerGlobalScope, m_injectedScriptManager.get()));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorHeapProfilerAgent>(m_instrumentingAgents.get(), m_injectedScriptManager.get()));
</span><del>- m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), nullptr, nullptr, InspectorTimelineAgent::WorkerInspector, nullptr));
</del><ins>+ m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), nullptr, InspectorTimelineAgent::WorkerInspector, nullptr));
</ins><span class="cx"> m_agents.append(std::move(consoleAgent));
</span><span class="cx">
</span><span class="cx"> if (CommandLineAPIHost* commandLineAPIHost = m_injectedScriptManager->commandLineAPIHost()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolMemoryjson"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/protocol/Memory.json (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Memory.json 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebCore/inspector/protocol/Memory.json 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-{
- "domain": "Memory",
- "types": [
- {
- "id": "MemoryBlock",
- "type": "object",
- "properties": [
- { "name": "size", "type": "number", "optional": true, "description": "Size of the block in bytes if available" },
- { "name": "name", "type": "string", "description": "Unique name used to identify the component that allocated this block" },
- { "name": "children", "type": "array", "optional": true, "items": { "$ref": "MemoryBlock" }}
- ]
- }
- ],
- "commands": [
- {
- "name": "getDOMCounters",
- "returns": [
- { "name": "documents", "type": "integer" },
- { "name": "nodes", "type": "integer" },
- { "name": "jsEventListeners", "type": "integer" }
- ]
- }
- ]
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-02-25 Andreas Kling <akling@apple.com>
+
+ Prune dead code for Web Inspector memory instrumentation.
+ <https://webkit.org/b/129286>
+
+ Reviewed by Sam Weinig.
+
+ * UserInterface/Protocol/InspectorWebBackendCommands.js:
+
</ins><span class="cx"> 2014-02-24 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Switch from prefixed CSS gradient to unprefixed.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js (164636 => 164637)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js 2014-02-25 08:09:33 UTC (rev 164636)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorWebBackendCommands.js 2014-02-25 08:19:25 UTC (rev 164637)
</span><span class="lines">@@ -183,10 +183,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("LayerTree.layersForNode", [{"name": "nodeId", "type": "number", "optional": false}], ["layers"]);
</span><span class="cx"> InspectorBackend.registerCommand("LayerTree.reasonsForCompositingLayer", [{"name": "layerId", "type": "string", "optional": false}], ["compositingReasons"]);
</span><span class="cx">
</span><del>-// Memory.
-InspectorBackend.registerMemoryDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Memory");
-InspectorBackend.registerCommand("Memory.getDOMCounters", [], ["documents", "nodes", "jsEventListeners"]);
-
</del><span class="cx"> // Network.
</span><span class="cx"> InspectorBackend.registerNetworkDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Network");
</span><span class="cx"> InspectorBackend.registerEnum("Network.InitiatorType", {Parser: "parser", Script: "script", Other: "other"});
</span></span></pre>
</div>
</div>
</body>
</html>