<!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>[173198] 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/173198">173198</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-09-02 20:17:47 -0700 (Tue, 02 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
https://bugs.webkit.org/show_bug.cgi?id=136462
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
It's not used by the frontend anymore.
* CMakeLists.txt:
* DerivedSources.make:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* inspector/JSConsoleClient.cpp:
(Inspector::JSConsoleClient::JSConsoleClient): Stub out console.profile/profileEnd
methods since they didn't work for JSContexts anyway.
(Inspector::JSConsoleClient::profile):
(Inspector::JSConsoleClient::profileEnd):
* inspector/JSConsoleClient.h:
* inspector/JSGlobalObjectInspectorController.cpp:
(Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
* inspector/agents/InspectorProfilerAgent.cpp: Removed.
* inspector/agents/InspectorProfilerAgent.h: Removed.
* inspector/agents/JSGlobalObjectProfilerAgent.cpp: Removed.
* inspector/agents/JSGlobalObjectProfilerAgent.h: Removed.
* inspector/protocol/Profiler.json: Removed.
Source/WebCore:
It's not used by the frontend anymore.
No new tests, no behavior changed.
* CMakeLists.txt:
* ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h: Removed.
* WebCore.order:
* 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/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCommitLoadImpl):
* inspector/InstrumentingAgents.cpp:
(WebCore::InstrumentingAgents::InstrumentingAgents):
(WebCore::InstrumentingAgents::reset):
* inspector/InstrumentingAgents.h:
(WebCore::InstrumentingAgents::inspectorProfilerAgent): Deleted.
(WebCore::InstrumentingAgents::setInspectorProfilerAgent): Deleted.
* inspector/PageProfilerAgent.cpp: Removed.
* inspector/PageProfilerAgent.h: Removed.
* inspector/TimelineRecordFactory.cpp: Moved these builders to their only callsite.
(WebCore::buildInspectorObject):
(WebCore::buildProfileInspectorObject):
(WebCore::TimelineRecordFactory::appendProfile):
* inspector/WebProfilerAgent.cpp: Removed.
* inspector/WebProfilerAgent.h: Removed.
* inspector/WorkerInspectorController.cpp:
(WebCore::WorkerInspectorController::WorkerInspectorController):
* inspector/WorkerProfilerAgent.cpp: Removed.
* inspector/WorkerProfilerAgent.h: Removed.
* inspector/protocol/Timeline.json:
Source/WebInspectorUI:
The legacy profiler manager didn't do anything, and its views and models
have been superseded by new views and models based on the Timeline classes.
* .eslintrc:
* UserInterface/Base/Main.js:
(WebInspector.loaded):
(WebInspector.openURL): Remove profile URL handling code.
* UserInterface/Controllers/LegacyProfileManager.js: Removed.
* UserInterface/Main.html:
* UserInterface/Protocol/ConsoleObserver.js:
(WebInspector.ConsoleObserver.prototype.messageAdded):
* UserInterface/Protocol/InspectorFrontendAPI.js:
(InspectorFrontendAPI.isProfilingJavaScript): Deleted.
(InspectorFrontendAPI.startProfilingJavaScript): Deleted.
(InspectorFrontendAPI.stopProfilingJavaScript): Deleted.
* UserInterface/Protocol/LegacyProfilerObserver.js: Removed.
* UserInterface/Views/LegacyBottomUpProfileDataGridTree.js: Removed.
* UserInterface/Views/LegacyJavaScriptProfileObject.js: Removed.
* UserInterface/Views/LegacyJavaScriptProfileType.js: Removed.
* UserInterface/Views/LegacyJavaScriptProfileView.css: Removed.
* UserInterface/Views/LegacyJavaScriptProfileView.js: Removed.
* UserInterface/Views/LegacyProfileDataGridTree.js: Removed.
* UserInterface/Views/LegacyProfileObject.js: Removed.
* UserInterface/Views/LegacyProfileType.js: Removed.
* UserInterface/Views/LegacyProfileView.css: Removed.
* UserInterface/Views/LegacyProfileView.js: Removed.
* UserInterface/Views/LegacyTopDownProfileDataGridTree.js: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreDerivedSourcesmake">trunk/Source/JavaScriptCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSConsoleClientcpp">trunk/Source/JavaScriptCore/inspector/JSConsoleClient.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSConsoleClienth">trunk/Source/JavaScriptCore/inspector/JSConsoleClient.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp">trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreorder">trunk/Source/WebCore/WebCore.order</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="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentscpp">trunk/Source/WebCore/inspector/InstrumentingAgents.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInstrumentingAgentsh">trunk/Source/WebCore/inspector/InstrumentingAgents.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactorycpp">trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerInspectorControllercpp">trunk/Source/WebCore/inspector/WorkerInspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolTimelinejson">trunk/Source/WebCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#trunkSourceWebInspectorUIeslintrc">trunk/Source/WebInspectorUI/.eslintrc</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolConsoleObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectProfilerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectProfilerAgenth">trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolProfilerjson">trunk/Source/JavaScriptCore/inspector/protocol/Profiler.json</a></li>
<li><a href="#trunkSourceWebCoreForwardingHeadersinspectoragentsInspectorProfilerAgenth">trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageProfilerAgentcpp">trunk/Source/WebCore/inspector/PageProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorPageProfilerAgenth">trunk/Source/WebCore/inspector/PageProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebProfilerAgentcpp">trunk/Source/WebCore/inspector/WebProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWebProfilerAgenth">trunk/Source/WebCore/inspector/WebProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerProfilerAgentcpp">trunk/Source/WebCore/inspector/WorkerProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorWorkerProfilerAgenth">trunk/Source/WebCore/inspector/WorkerProfilerAgent.h</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersLegacyProfileManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/LegacyProfileManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLegacyProfilerObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/LegacyProfilerObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyBottomUpProfileDataGridTreejs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyBottomUpProfileDataGridTree.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileObjectjs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileTypejs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileType.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileDataGridTreejs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileDataGridTree.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileObjectjs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileObject.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileTypejs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileType.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileViewcss">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.css</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLegacyTopDownProfileDataGridTreejs">trunk/Source/WebInspectorUI/UserInterface/Views/LegacyTopDownProfileDataGridTree.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -300,11 +300,9 @@
</span><span class="cx"> inspector/agents/InspectorAgent.cpp
</span><span class="cx"> inspector/agents/InspectorConsoleAgent.cpp
</span><span class="cx"> inspector/agents/InspectorDebuggerAgent.cpp
</span><del>- inspector/agents/InspectorProfilerAgent.cpp
</del><span class="cx"> inspector/agents/InspectorRuntimeAgent.cpp
</span><span class="cx"> inspector/agents/JSGlobalObjectConsoleAgent.cpp
</span><span class="cx"> inspector/agents/JSGlobalObjectDebuggerAgent.cpp
</span><del>- inspector/agents/JSGlobalObjectProfilerAgent.cpp
</del><span class="cx"> inspector/agents/JSGlobalObjectRuntimeAgent.cpp
</span><span class="cx">
</span><span class="cx"> interpreter/AbstractPC.cpp
</span><span class="lines">@@ -956,7 +954,6 @@
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Debugger.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/InspectorDomain.json
</span><del>- ${JAVASCRIPTCORE_DIR}/inspector/protocol/Profiler.json
</del><span class="cx"> ${JAVASCRIPTCORE_DIR}/inspector/protocol/Runtime.json
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-09-02 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=136462
+
+ Reviewed by Timothy Hatcher.
+
+ It's not used by the frontend anymore.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+
+ * inspector/JSConsoleClient.cpp:
+ (Inspector::JSConsoleClient::JSConsoleClient): Stub out console.profile/profileEnd
+ methods since they didn't work for JSContexts anyway.
+ (Inspector::JSConsoleClient::profile):
+ (Inspector::JSConsoleClient::profileEnd):
+ * inspector/JSConsoleClient.h:
+
+ * inspector/JSGlobalObjectInspectorController.cpp:
+ (Inspector::JSGlobalObjectInspectorController::JSGlobalObjectInspectorController):
+ * inspector/agents/InspectorProfilerAgent.cpp: Removed.
+ * inspector/agents/InspectorProfilerAgent.h: Removed.
+ * inspector/agents/JSGlobalObjectProfilerAgent.cpp: Removed.
+ * inspector/agents/JSGlobalObjectProfilerAgent.h: Removed.
+ * inspector/protocol/Profiler.json: Removed.
+
</ins><span class="cx"> 2014-09-02 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Optimize own property GetByVals with rope string subscripts.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/DerivedSources.make (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/DerivedSources.make 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/DerivedSources.make 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -117,7 +117,6 @@
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/Debugger.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
</span><span class="cx"> $(JavaScriptCore)/inspector/protocol/InspectorDomain.json \
</span><del>- $(JavaScriptCore)/inspector/protocol/Profiler.json \
</del><span class="cx"> $(JavaScriptCore)/inspector/protocol/Runtime.json \
</span><span class="cx"> #
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -574,7 +574,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorAgent.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorConsoleAgent.cpp" />
</span><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorDebuggerAgent.cpp" />
</span><del>- <ClCompile Include="..\inspector\agents\InspectorProfilerAgent.cpp" />
</del><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorRuntimeAgent.cpp" />
</span><span class="cx"> <ClCompile Include="..\interpreter\AbstractPC.cpp" />
</span><span class="cx"> <ClCompile Include="..\interpreter\CallFrame.cpp" />
</span><span class="lines">@@ -1278,7 +1277,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorDebuggerAgent.h" />
</span><del>- <ClInclude Include="..\inspector\agents\InspectorProfilerAgent.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorRuntimeAgent.h" />
</span><span class="cx"> <ClInclude Include="..\interpreter\AbstractPC.h" />
</span><span class="cx"> <ClInclude Include="..\interpreter\CachedCall.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -342,9 +342,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorDebuggerAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\agents\InspectorProfilerAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\agents\InspectorRuntimeAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -2192,9 +2189,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorDebuggerAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\agents\InspectorProfilerAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\agents\InspectorRuntimeAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -833,10 +833,6 @@
</span><span class="cx"> 14F97447138C853E00DA1C67 /* HeapRootVisitor.h in Headers */ = {isa = PBXBuildFile; fileRef = 14F97446138C853E00DA1C67 /* HeapRootVisitor.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A28D4A8177B71C80007FA3C /* JSStringRefPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A28D4A7177B71C80007FA3C /* JSStringRefPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1ACF7377171CA6FB00C9BB1E /* Weak.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACF7376171CA6FB00C9BB1E /* Weak.cpp */; };
</span><del>- 1CAA9A1E18F4997F000A369D /* InspectorProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CAA9A1C18F4997F000A369D /* InspectorProfilerAgent.cpp */; };
- 1CAA9A1F18F4997F000A369D /* InspectorProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA9A1D18F4997F000A369D /* InspectorProfilerAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 1CAA9A2218F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CAA9A2018F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp */; };
- 1CAA9A2318F4A220000A369D /* JSGlobalObjectProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CAA9A2118F4A220000A369D /* JSGlobalObjectProfilerAgent.h */; };
</del><span class="cx"> 2600B5A6152BAAA70091EE5F /* JSStringJoiner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */; };
</span><span class="cx"> 2600B5A7152BAAA70091EE5F /* JSStringJoiner.h in Headers */ = {isa = PBXBuildFile; fileRef = 2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */; };
</span><span class="cx"> 2A05ABD51961DF2400341750 /* JSPropertyNameEnumerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A05ABD31961DF2400341750 /* JSPropertyNameEnumerator.cpp */; };
</span><span class="lines">@@ -2719,10 +2715,6 @@
</span><span class="cx"> 1C9051450BA9E8A70081E9D0 /* Base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 1CAA8B4A0D32C39A0041BCFF /* JavaScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScript.h; sourceTree = "<group>"; };
</span><span class="cx"> 1CAA8B4B0D32C39A0041BCFF /* JavaScriptCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JavaScriptCore.h; sourceTree = "<group>"; };
</span><del>- 1CAA9A1C18F4997F000A369D /* InspectorProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorProfilerAgent.cpp; sourceTree = "<group>"; };
- 1CAA9A1D18F4997F000A369D /* InspectorProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorProfilerAgent.h; sourceTree = "<group>"; };
- 1CAA9A2018F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSGlobalObjectProfilerAgent.cpp; sourceTree = "<group>"; };
- 1CAA9A2118F4A220000A369D /* JSGlobalObjectProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSGlobalObjectProfilerAgent.h; sourceTree = "<group>"; };
</del><span class="cx"> 2600B5A4152BAAA70091EE5F /* JSStringJoiner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSStringJoiner.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2600B5A5152BAAA70091EE5F /* JSStringJoiner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringJoiner.h; sourceTree = "<group>"; };
</span><span class="cx"> 2A05ABD31961DF2400341750 /* JSPropertyNameEnumerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPropertyNameEnumerator.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5320,16 +5312,12 @@
</span><span class="cx"> A5FD0080189B191A00633231 /* InspectorConsoleAgent.h */,
</span><span class="cx"> A57D23E31890CEBF0031C7FA /* InspectorDebuggerAgent.cpp */,
</span><span class="cx"> A57D23E41890CEBF0031C7FA /* InspectorDebuggerAgent.h */,
</span><del>- 1CAA9A1C18F4997F000A369D /* InspectorProfilerAgent.cpp */,
- 1CAA9A1D18F4997F000A369D /* InspectorProfilerAgent.h */,
</del><span class="cx"> A50E4B5D18809DD50068A46D /* InspectorRuntimeAgent.cpp */,
</span><span class="cx"> A50E4B5E18809DD50068A46D /* InspectorRuntimeAgent.h */,
</span><span class="cx"> A5FD0083189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp */,
</span><span class="cx"> A5FD0084189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h */,
</span><span class="cx"> A57D23E71891B0770031C7FA /* JSGlobalObjectDebuggerAgent.cpp */,
</span><span class="cx"> A57D23E81891B0770031C7FA /* JSGlobalObjectDebuggerAgent.h */,
</span><del>- 1CAA9A2018F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp */,
- 1CAA9A2118F4A220000A369D /* JSGlobalObjectProfilerAgent.h */,
</del><span class="cx"> A50E4B5F18809DD50068A46D /* JSGlobalObjectRuntimeAgent.cpp */,
</span><span class="cx"> A50E4B6018809DD50068A46D /* JSGlobalObjectRuntimeAgent.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -6209,7 +6197,6 @@
</span><span class="cx"> A76140D2182982CB00750624 /* JSArgumentsIterator.h in Headers */,
</span><span class="cx"> BC18C4170E16F5CD00B34460 /* JSArray.h in Headers */,
</span><span class="cx"> 0F2B66E317B6B5AB00A7AE3F /* JSArrayBuffer.h in Headers */,
</span><del>- 1CAA9A2318F4A220000A369D /* JSGlobalObjectProfilerAgent.h in Headers */,
</del><span class="cx"> 0F2B66E517B6B5AB00A7AE3F /* JSArrayBufferConstructor.h in Headers */,
</span><span class="cx"> 0F2B66E717B6B5AB00A7AE3F /* JSArrayBufferPrototype.h in Headers */,
</span><span class="cx"> 0F2B66E917B6B5AB00A7AE3F /* JSArrayBufferView.h in Headers */,
</span><span class="lines">@@ -6237,7 +6224,6 @@
</span><span class="cx"> A72028B81797601E0098028C /* JSCTestRunnerUtils.h in Headers */,
</span><span class="cx"> 0F7576D318E1FEE9002EF4CD /* AccessorCallJITStubRoutine.h in Headers */,
</span><span class="cx"> 0F2B66EC17B6B5AB00A7AE3F /* JSDataView.h in Headers */,
</span><del>- 1CAA9A1F18F4997F000A369D /* InspectorProfilerAgent.h in Headers */,
</del><span class="cx"> 0F2B66EE17B6B5AB00A7AE3F /* JSDataViewPrototype.h in Headers */,
</span><span class="cx"> 978801411471AD920041B016 /* JSDateMath.h in Headers */,
</span><span class="cx"> C2A7F688160432D400F76B98 /* JSDestructibleObject.h in Headers */,
</span><span class="lines">@@ -7398,7 +7384,6 @@
</span><span class="cx"> 0F485329187DFDEC0083B687 /* FTLRecoveryOpcode.cpp in Sources */,
</span><span class="cx"> 0F6B1CC31862C47800845D97 /* FTLRegisterAtOffset.cpp in Sources */,
</span><span class="cx"> 0FCEFAAB1804C13E00472CE4 /* FTLSaveRestore.cpp in Sources */,
</span><del>- 1CAA9A2218F4A220000A369D /* JSGlobalObjectProfilerAgent.cpp in Sources */,
</del><span class="cx"> 0F25F1B1181635F300522F39 /* FTLSlowPathCall.cpp in Sources */,
</span><span class="cx"> 0F25F1B3181635F300522F39 /* FTLSlowPathCallKey.cpp in Sources */,
</span><span class="cx"> 0F9D339A1803ADB70073C2BC /* FTLStackMaps.cpp in Sources */,
</span><span class="lines">@@ -7622,7 +7607,6 @@
</span><span class="cx"> 0FF729AE166AD35C000F5BA3 /* ProfilerBytecodes.cpp in Sources */,
</span><span class="cx"> 0F13912916771C33009CCB07 /* ProfilerBytecodeSequence.cpp in Sources */,
</span><span class="cx"> 0FF729AF166AD35C000F5BA3 /* ProfilerCompilation.cpp in Sources */,
</span><del>- 1CAA9A1E18F4997F000A369D /* InspectorProfilerAgent.cpp in Sources */,
</del><span class="cx"> 0FF729B0166AD35C000F5BA3 /* ProfilerCompilationKind.cpp in Sources */,
</span><span class="cx"> 0FF729B1166AD35C000F5BA3 /* ProfilerCompiledBytecode.cpp in Sources */,
</span><span class="cx"> 0FF729B2166AD35C000F5BA3 /* ProfilerDatabase.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSConsoleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSConsoleClient.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSConsoleClient.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/JSConsoleClient.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="cx"> #include "InspectorConsoleAgent.h"
</span><del>-#include "InspectorProfilerAgent.h"
</del><span class="cx"> #include "ScriptArguments.h"
</span><span class="cx"> #include "ScriptCallStack.h"
</span><span class="cx"> #include "ScriptCallStackFactory.h"
</span><span class="lines">@@ -66,10 +65,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSConsoleClient::JSConsoleClient(InspectorConsoleAgent* consoleAgent, InspectorProfilerAgent* profilerAgent)
</del><ins>+JSConsoleClient::JSConsoleClient(InspectorConsoleAgent* consoleAgent)
</ins><span class="cx"> : ConsoleClient()
</span><span class="cx"> , m_consoleAgent(consoleAgent)
</span><del>- , m_profilerAgent(profilerAgent)
</del><span class="cx"> {
</span><span class="cx"> static std::once_flag initializeLogging;
</span><span class="cx"> std::call_once(initializeLogging, []{
</span><span class="lines">@@ -94,29 +92,14 @@
</span><span class="cx"> m_consoleAgent->count(exec, arguments);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSConsoleClient::profile(JSC::ExecState* exec, const String& title)
</del><ins>+void JSConsoleClient::profile(JSC::ExecState*, const String&)
</ins><span class="cx"> {
</span><del>- if (!m_profilerAgent->enabled())
- return;
-
- String resolvedTitle = m_profilerAgent->startProfiling(title);
-
- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
- m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, MessageType::Profile, MessageLevel::Debug, resolvedTitle, callStack);
</del><ins>+ // FIXME: support |console.profile| for JSContexts. <https://webkit.org/b/136466>
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void JSConsoleClient::profileEnd(JSC::ExecState* exec, const String& title)
</del><ins>+void JSConsoleClient::profileEnd(JSC::ExecState*, const String&)
</ins><span class="cx"> {
</span><del>- if (!m_profilerAgent->enabled())
- return;
-
- RefPtr<JSC::Profile> profile = m_profilerAgent->stopProfiling(title);
- if (!profile)
- return;
-
- RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(exec, 1));
- String message = makeString(profile->title(), '#', String::number(profile->uid()));
- m_consoleAgent->addMessageToConsole(MessageSource::ConsoleAPI, MessageType::Profile, MessageLevel::Debug, message, callStack);
</del><ins>+ // FIXME: support |console.profile| for JSContexts. <https://webkit.org/b/136466>
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSConsoleClient::time(ExecState*, const String& title)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSConsoleClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSConsoleClient.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSConsoleClient.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/JSConsoleClient.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -31,12 +31,11 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> class InspectorConsoleAgent;
</span><del>-class InspectorProfilerAgent;
</del><span class="cx">
</span><span class="cx"> class JSConsoleClient final : public JSC::ConsoleClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- explicit JSConsoleClient(InspectorConsoleAgent*, InspectorProfilerAgent*);
</del><ins>+ explicit JSConsoleClient(InspectorConsoleAgent*);
</ins><span class="cx"> virtual ~JSConsoleClient() { }
</span><span class="cx">
</span><span class="cx"> static bool logToSystemConsole();
</span><span class="lines">@@ -57,7 +56,6 @@
</span><span class="cx"> void internalAddMessage(MessageType, MessageLevel, JSC::ExecState*, PassRefPtr<ScriptArguments>);
</span><span class="cx">
</span><span class="cx"> InspectorConsoleAgent* m_consoleAgent;
</span><del>- InspectorProfilerAgent* m_profilerAgent;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSGlobalObjectInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "JSGlobalObject.h"
</span><span class="cx"> #include "JSGlobalObjectConsoleAgent.h"
</span><span class="cx"> #include "JSGlobalObjectDebuggerAgent.h"
</span><del>-#include "JSGlobalObjectProfilerAgent.h"
</del><span class="cx"> #include "JSGlobalObjectRuntimeAgent.h"
</span><span class="cx"> #include "ScriptArguments.h"
</span><span class="cx"> #include "ScriptCallStack.h"
</span><span class="lines">@@ -61,13 +60,11 @@
</span><span class="cx"> auto runtimeAgent = std::make_unique<JSGlobalObjectRuntimeAgent>(m_injectedScriptManager.get(), m_globalObject);
</span><span class="cx"> auto consoleAgent = std::make_unique<JSGlobalObjectConsoleAgent>(m_injectedScriptManager.get());
</span><span class="cx"> auto debuggerAgent = std::make_unique<JSGlobalObjectDebuggerAgent>(m_injectedScriptManager.get(), m_globalObject, consoleAgent.get());
</span><del>- auto profilerAgent = std::make_unique<JSGlobalObjectProfilerAgent>(m_globalObject);
</del><span class="cx">
</span><span class="cx"> m_consoleAgent = consoleAgent.get();
</span><del>- m_consoleClient = std::make_unique<JSConsoleClient>(m_consoleAgent, profilerAgent.get());
</del><ins>+ m_consoleClient = std::make_unique<JSConsoleClient>(m_consoleAgent);
</ins><span class="cx">
</span><span class="cx"> runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
</span><del>- profilerAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
</del><span class="cx">
</span><span class="cx"> m_agents.append(std::make_unique<InspectorAgent>());
</span><span class="cx"> m_agents.append(WTF::move(runtimeAgent));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,289 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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"
-#include "InspectorProfilerAgent.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorValues.h"
-#include "LegacyProfiler.h"
-#include "Profile.h"
-#include "ScriptDebugServer.h"
-#include "ScriptObject.h"
-#include <wtf/CurrentTime.h>
-#include <wtf/text/StringConcatenate.h>
-
-namespace Inspector {
-
-static const char* const UserInitiatedProfileName = "org.webkit.profiles.user-initiated";
-static const char* const CPUProfileType = "CPU";
-
-InspectorProfilerAgent::InspectorProfilerAgent()
- : InspectorAgentBase(ASCIILiteral("Profiler"))
- , m_scriptDebugServer(nullptr)
- , m_enabled(false)
- , m_profileHeadersRequested(false)
- , m_recordingProfileCount(0)
- , m_nextUserInitiatedProfileNumber(1)
-{
-}
-
-InspectorProfilerAgent::~InspectorProfilerAgent()
-{
-}
-
-void InspectorProfilerAgent::didCreateFrontendAndBackend(InspectorFrontendChannel* frontendChannel, InspectorBackendDispatcher* backendDispatcher)
-{
- m_frontendDispatcher = std::make_unique<InspectorProfilerFrontendDispatcher>(frontendChannel);
- m_backendDispatcher = InspectorProfilerBackendDispatcher::create(backendDispatcher, this);
-}
-
-void InspectorProfilerAgent::willDestroyFrontendAndBackend(InspectorDisconnectReason reason)
-{
- m_frontendDispatcher = nullptr;
- m_backendDispatcher.clear();
-
- reset();
-
- disable(reason == InspectorDisconnectReason::InspectedTargetDestroyed ? SkipRecompile : Recompile);
-}
-
-void InspectorProfilerAgent::addProfile(PassRefPtr<JSC::Profile> prpProfile)
-{
- RefPtr<JSC::Profile> profile = prpProfile;
- m_profiles.add(profile->uid(), profile);
-
- if (m_frontendDispatcher && m_profileHeadersRequested)
- m_frontendDispatcher->addProfileHeader(createProfileHeader(*profile));
-}
-
-PassRefPtr<Protocol::Profiler::ProfileHeader> InspectorProfilerAgent::createProfileHeader(const JSC::Profile& profile)
-{
- return Protocol::Profiler::ProfileHeader::create()
- .setTypeId(Protocol::Profiler::ProfileHeader::TypeId::CPU)
- .setUid(profile.uid())
- .setTitle(profile.title())
- .release();
-}
-
-void InspectorProfilerAgent::enable(ErrorString*)
-{
- enable(Recompile);
-}
-
-void InspectorProfilerAgent::disable(ErrorString*)
-{
- disable(Recompile);
-}
-
-void InspectorProfilerAgent::enable(ShouldRecompile shouldRecompile)
-{
- if (m_enabled)
- return;
-
- m_enabled = true;
-
- if (shouldRecompile == Recompile)
- m_scriptDebugServer->recompileAllJSFunctions();
-}
-
-void InspectorProfilerAgent::disable(ShouldRecompile shouldRecompile)
-{
- if (!m_enabled)
- return;
-
- m_enabled = false;
- m_profileHeadersRequested = false;
-
- if (shouldRecompile == Recompile)
- m_scriptDebugServer->recompileAllJSFunctions();
-}
-
-String InspectorProfilerAgent::getUserInitiatedProfileName()
-{
- return makeString(UserInitiatedProfileName, '.', String::number(m_nextUserInitiatedProfileNumber++));
-}
-
-void InspectorProfilerAgent::getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>& headers)
-{
- m_profileHeadersRequested = true;
- headers = Protocol::Array<Protocol::Profiler::ProfileHeader>::create();
-
- for (auto& profile : m_profiles.values())
- headers->addItem(createProfileHeader(*profile.get()));
-}
-
-static PassRefPtr<Protocol::Profiler::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
-{
- RefPtr<Protocol::Profiler::CPUProfileNodeCall> result = Protocol::Profiler::CPUProfileNodeCall::create()
- .setStartTime(call.startTime())
- .setTotalTime(call.totalTime());
- return result.release();
-}
-
-static PassRefPtr<Protocol::Profiler::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
-{
- RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>> calls = Protocol::Array<Protocol::Profiler::CPUProfileNodeCall>::create();
- for (const JSC::ProfileNode::Call& call : node->calls())
- calls->addItem(buildInspectorObject(call));
-
- RefPtr<Protocol::Profiler::CPUProfileNode> result = Protocol::Profiler::CPUProfileNode::create()
- .setId(node->id())
- .setCalls(calls.release());
-
- if (!node->functionName().isEmpty())
- result->setFunctionName(node->functionName());
-
- if (!node->url().isEmpty()) {
- result->setUrl(node->url());
- result->setLineNumber(node->lineNumber());
- result->setColumnNumber(node->columnNumber());
- }
-
- if (!node->children().isEmpty()) {
- RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> children = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
- for (RefPtr<JSC::ProfileNode> profileNode : node->children())
- children->addItem(buildInspectorObject(profileNode.get()));
- result->setChildren(children);
- }
-
- return result.release();
-}
-
-PassRefPtr<Protocol::Profiler::CPUProfile> InspectorProfilerAgent::buildProfileInspectorObject(const JSC::Profile* profile)
-{
- RefPtr<Protocol::Array<Protocol::Profiler::CPUProfileNode>> rootNodes = Protocol::Array<Protocol::Profiler::CPUProfileNode>::create();
- for (RefPtr<JSC::ProfileNode> profileNode : profile->head()->children())
- rootNodes->addItem(buildInspectorObject(profileNode.get()));
-
- RefPtr<Protocol::Profiler::CPUProfile> result = Protocol::Profiler::CPUProfile::create()
- .setRootNodes(rootNodes);
-
- if (profile->idleTime())
- result->setIdleTime(profile->idleTime());
-
- return result.release();
-}
-
-void InspectorProfilerAgent::getCPUProfile(ErrorString* errorString, int rawUid, RefPtr<Protocol::Profiler::CPUProfile>& profileObject)
-{
- unsigned uid = static_cast<unsigned>(rawUid);
- auto it = m_profiles.find(uid);
- if (it == m_profiles.end()) {
- *errorString = ASCIILiteral("Profile wasn't found");
- return;
- }
-
- profileObject = buildProfileInspectorObject(it->value.get());
-}
-
-void InspectorProfilerAgent::removeProfile(ErrorString*, const String& type, int rawUid)
-{
- unsigned uid = static_cast<unsigned>(rawUid);
- if (type == CPUProfileType)
- m_profiles.remove(uid);
-}
-
-void InspectorProfilerAgent::reset()
-{
- stop();
-
- m_profiles.clear();
- m_nextUserInitiatedProfileNumber = 1;
- m_profileHeadersRequested = false;
-
- if (m_frontendDispatcher && m_profileHeadersRequested)
- m_frontendDispatcher->resetProfiles();
-}
-
-void InspectorProfilerAgent::start(ErrorString*)
-{
- startProfiling();
-}
-
-void InspectorProfilerAgent::stop(ErrorString*)
-{
- stopProfiling();
-}
-
-void InspectorProfilerAgent::setRecordingProfile(bool isProfiling)
-{
- if (m_frontendDispatcher)
- m_frontendDispatcher->setRecordingProfile(isProfiling);
-}
-
-String InspectorProfilerAgent::startProfiling(const String &title, JSC::ExecState* exec)
-{
- if (!enabled())
- enable(Recompile);
-
- bool wasNotRecording = !m_recordingProfileCount;
- ++m_recordingProfileCount;
-
- String resolvedTitle = title;
- if (title.isEmpty())
- resolvedTitle = getUserInitiatedProfileName();
-
- if (!exec)
- exec = profilingGlobalExecState();
- ASSERT(exec);
-
- JSC::LegacyProfiler::profiler()->startProfiling(exec, resolvedTitle);
-
- if (wasNotRecording)
- setRecordingProfile(true);
-
- return resolvedTitle;
-}
-
-PassRefPtr<JSC::Profile> InspectorProfilerAgent::stopProfiling(const String& title, JSC::ExecState* exec)
-{
- if (!m_recordingProfileCount)
- return nullptr;
-
- --m_recordingProfileCount;
-
- if (!exec)
- exec = profilingGlobalExecState();
- ASSERT(exec);
-
- RefPtr<JSC::Profile> profile = JSC::LegacyProfiler::profiler()->stopProfiling(exec, title);
- if (profile)
- addProfile(profile);
-
- if (!m_recordingProfileCount)
- setRecordingProfile(false);
-
- return profile.release();
-}
-
-} // namespace Inspector
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorProfilerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorProfilerAgent.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,119 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 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:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- * 3. Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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 InspectorProfilerAgent_h
-#define InspectorProfilerAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorJSBackendDispatchers.h"
-#include "InspectorJSFrontendDispatchers.h"
-#include "inspector/InspectorAgentBase.h"
-#include <wtf/Forward.h>
-#include <wtf/HashMap.h>
-#include <wtf/Noncopyable.h>
-#include <wtf/text/WTFString.h>
-
-namespace JSC {
-class ExecState;
-class Profile;
-}
-
-namespace Inspector {
-
-class ScriptDebugServer;
-
-typedef String ErrorString;
-
-class JS_EXPORT_PRIVATE InspectorProfilerAgent : public InspectorAgentBase, public InspectorProfilerBackendDispatcherHandler {
- WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent);
- WTF_MAKE_FAST_ALLOCATED;
-public:
- virtual ~InspectorProfilerAgent();
-
- virtual void didCreateFrontendAndBackend(InspectorFrontendChannel*, InspectorBackendDispatcher*) override final;
- virtual void willDestroyFrontendAndBackend(InspectorDisconnectReason) override final;
-
- virtual void enable(ErrorString*) override final;
- virtual void disable(ErrorString*) override final;
-
- virtual void start(ErrorString* = nullptr) override final;
- virtual void stop(ErrorString* = nullptr) override final;
-
- virtual void clearProfiles(ErrorString*) override final { reset(); }
-
- virtual void getProfileHeaders(ErrorString*, RefPtr<Protocol::Array<Protocol::Profiler::ProfileHeader>>&) override final;
- virtual void getCPUProfile(ErrorString*, int uid, RefPtr<Protocol::Profiler::CPUProfile>&) override final;
- virtual void removeProfile(ErrorString*, const String& type, int uid) override final;
-
- static PassRefPtr<Protocol::Profiler::CPUProfile> buildProfileInspectorObject(const JSC::Profile*);
-
- enum ShouldRecompile { SkipRecompile, Recompile };
-
- virtual void enable(ShouldRecompile);
- virtual void disable(ShouldRecompile);
-
- bool enabled() const { return m_enabled; }
-
- void reset();
-
- void setScriptDebugServer(ScriptDebugServer* scriptDebugServer) { m_scriptDebugServer = scriptDebugServer; }
-
- String startProfiling(const String& title = String(), JSC::ExecState* = nullptr);
- PassRefPtr<JSC::Profile> stopProfiling(const String& title = String(), JSC::ExecState* = nullptr);
-
-protected:
- InspectorProfilerAgent();
-
- virtual JSC::ExecState* profilingGlobalExecState() const = 0;
-
-private:
- void addProfile(PassRefPtr<JSC::Profile>);
-
- void setRecordingProfile(bool isProfiling);
-
- String getUserInitiatedProfileName();
-
- PassRefPtr<Protocol::Profiler::ProfileHeader> createProfileHeader(const JSC::Profile&);
-
- std::unique_ptr<InspectorProfilerFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorProfilerBackendDispatcher> m_backendDispatcher;
- HashMap<unsigned, RefPtr<JSC::Profile>> m_profiles;
- ScriptDebugServer* m_scriptDebugServer;
- bool m_enabled;
- bool m_profileHeadersRequested;
- unsigned m_recordingProfileCount;
- unsigned m_nextUserInitiatedProfileNumber;
-};
-
-} // namespace Inspector
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(InspectorProfilerAgent_h)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectProfilerAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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"
-#include "JSGlobalObjectProfilerAgent.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "JSGlobalObject.h"
-
-using namespace JSC;
-
-namespace Inspector {
-
-JSGlobalObjectProfilerAgent::JSGlobalObjectProfilerAgent(JSGlobalObject& globalObject)
- : InspectorProfilerAgent()
- , m_globalObject(globalObject)
-{
-}
-
-ExecState* JSGlobalObjectProfilerAgent::profilingGlobalExecState() const
-{
- return m_globalObject.globalExec();
-}
-
-} // namespace Inspector
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsJSGlobalObjectProfilerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/agents/JSGlobalObjectProfilerAgent.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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 JSGlobalObjectProfilerAgent_h
-#define JSGlobalObjectProfilerAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "InspectorProfilerAgent.h"
-
-namespace JSC {
-class JSGlobalObject;
-}
-
-namespace Inspector {
-
-class JSGlobalObjectProfilerAgent final : public InspectorProfilerAgent {
-public:
- JSGlobalObjectProfilerAgent(JSC::JSGlobalObject&);
-
-private:
- virtual JSC::ExecState* profilingGlobalExecState() const override;
-
- JSC::JSGlobalObject& m_globalObject;
-};
-
-} // namespace Inspector
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(JSGlobalObjectProfilerAgent_h)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolProfilerjson"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/inspector/protocol/Profiler.json (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Profiler.json 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Profiler.json 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,103 +0,0 @@
</span><del>-{
- "domain": "Profiler",
- "types": [
- {
- "id": "ProfileHeader",
- "type": "object",
- "description": "Profile header.",
- "properties": [
- { "name": "typeId", "type": "string", "enum": ["CPU"], "description": "Profile type name." },
- { "name": "title", "type": "string", "description": "Profile title." },
- { "name": "uid", "type": "integer", "description": "Unique identifier of the profile." }
- ]
- },
- {
- "id": "CPUProfileNodeCall",
- "type": "object",
- "description": "CPU Profile call info. Holds time information for a specific call that happened on a node.",
- "properties": [
- { "name": "startTime", "type": "number", "description": "Start time for the call." },
- { "name": "totalTime", "type": "number", "description": "Total execution time for the call." }
- ]
- },
- {
- "id": "CPUProfileNode",
- "type": "object",
- "description": "CPU Profile node. Holds callsite information, execution statistics and child nodes.",
- "properties": [
- { "name": "id", "type": "integer", "description": "Unique identifier for this call site." },
- { "name": "calls", "type": "array", "items": { "$ref": "CPUProfileNodeCall" }, "description": "Calls making up this node." },
- { "name": "functionName", "type": "string", "optional": true, "description": "Function name." },
- { "name": "url", "type": "string", "optional": true, "description": "URL." },
- { "name": "lineNumber", "type": "integer", "optional": true, "description": "Line number." },
- { "name": "columnNumber", "type": "integer", "optional": true, "description": "Column number." },
- { "name": "children", "type": "array", "items": { "$ref": "CPUProfileNode" }, "optional": true, "description": "Child nodes." }
- ]
- },
- {
- "id": "CPUProfile",
- "type": "object",
- "description": "Profile.",
- "properties": [
- { "name": "rootNodes", "type": "array", "items": { "$ref": "CPUProfileNode" }, "description": "Top level nodes in the stack." },
- { "name": "idleTime", "type": "number", "optional": true }
- ]
- }
- ],
- "commands": [
- {
- "name": "enable"
- },
- {
- "name": "disable"
- },
- {
- "name": "start"
- },
- {
- "name": "stop"
- },
- {
- "name": "getProfileHeaders",
- "returns": [
- { "name": "headers", "type": "array", "items": { "$ref": "ProfileHeader"} }
- ]
- },
- {
- "name": "getCPUProfile",
- "parameters": [
- { "name": "uid", "type": "integer" }
- ],
- "returns": [
- { "name": "profile", "$ref": "CPUProfile" }
- ]
- },
- {
- "name": "removeProfile",
- "parameters": [
- { "name": "type", "type": "string" },
- { "name": "uid", "type": "integer" }
- ]
- },
- {
- "name": "clearProfiles"
- }
- ],
- "events": [
- {
- "name": "addProfileHeader",
- "parameters": [
- { "name": "header", "$ref": "ProfileHeader" }
- ]
- },
- {
- "name": "setRecordingProfile",
- "parameters": [
- { "name": "isProfiling", "type": "boolean" }
- ]
- },
- {
- "name": "resetProfiles"
- }
- ]
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1806,7 +1806,6 @@
</span><span class="cx"> inspector/NetworkResourcesData.cpp
</span><span class="cx"> inspector/PageConsoleAgent.cpp
</span><span class="cx"> inspector/PageDebuggerAgent.cpp
</span><del>- inspector/PageProfilerAgent.cpp
</del><span class="cx"> inspector/PageRuntimeAgent.cpp
</span><span class="cx"> inspector/PageScriptDebugServer.cpp
</span><span class="cx"> inspector/TimelineRecordFactory.cpp
</span><span class="lines">@@ -1814,11 +1813,9 @@
</span><span class="cx"> inspector/WebDebuggerAgent.cpp
</span><span class="cx"> inspector/WebInjectedScriptHost.cpp
</span><span class="cx"> inspector/WebInjectedScriptManager.cpp
</span><del>- inspector/WebProfilerAgent.cpp
</del><span class="cx"> inspector/WorkerConsoleAgent.cpp
</span><span class="cx"> inspector/WorkerDebuggerAgent.cpp
</span><span class="cx"> inspector/WorkerInspectorController.cpp
</span><del>- inspector/WorkerProfilerAgent.cpp
</del><span class="cx"> inspector/WorkerRuntimeAgent.cpp
</span><span class="cx">
</span><span class="cx"> loader/CookieJar.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/ChangeLog 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-09-02 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=136462
+
+ Reviewed by Timothy Hatcher.
+
+ It's not used by the frontend anymore.
+
+ No new tests, no behavior changed.
+
+ * CMakeLists.txt:
+ * ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h: Removed.
+ * WebCore.order:
+ * 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/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didCommitLoadImpl):
+ * inspector/InstrumentingAgents.cpp:
+ (WebCore::InstrumentingAgents::InstrumentingAgents):
+ (WebCore::InstrumentingAgents::reset):
+ * inspector/InstrumentingAgents.h:
+ (WebCore::InstrumentingAgents::inspectorProfilerAgent): Deleted.
+ (WebCore::InstrumentingAgents::setInspectorProfilerAgent): Deleted.
+ * inspector/PageProfilerAgent.cpp: Removed.
+ * inspector/PageProfilerAgent.h: Removed.
+ * inspector/TimelineRecordFactory.cpp: Moved these builders to their only callsite.
+ (WebCore::buildInspectorObject):
+ (WebCore::buildProfileInspectorObject):
+ (WebCore::TimelineRecordFactory::appendProfile):
+ * inspector/WebProfilerAgent.cpp: Removed.
+ * inspector/WebProfilerAgent.h: Removed.
+ * inspector/WorkerInspectorController.cpp:
+ (WebCore::WorkerInspectorController::WorkerInspectorController):
+ * inspector/WorkerProfilerAgent.cpp: Removed.
+ * inspector/WorkerProfilerAgent.h: Removed.
+ * inspector/protocol/Timeline.json:
+
</ins><span class="cx"> 2014-09-02 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [EME][Mac] Refactor CDMPrivateMediaSourceAVFObjC to allow sessions to be created without being attached to an AVStreamDataParser.
</span></span></pre></div>
<a id="trunkSourceWebCoreForwardingHeadersinspectoragentsInspectorProfilerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/ForwardingHeaders/inspector/agents/InspectorProfilerAgent.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-#ifndef WebCore_FWD_InspectorProfilerAgent_h
-#define WebCore_FWD_InspectorProfilerAgent_h
-#include <JavaScriptCore/InspectorProfilerAgent.h>
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreWebCoreorder"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.order (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.order 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/WebCore.order 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -730,9 +730,6 @@
</span><span class="cx"> __ZN7WebCore19InspectorObjectBase8setValueERKN3WTF6StringENS1_10PassRefPtrINS_14InspectorValueEEE
</span><span class="cx"> __ZN7WebCore23InspectorCompositeState21inspectorStateUpdatedEv
</span><span class="cx"> __ZN7WebCore25InspectorDOMDebuggerAgent6createEPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateEPNS_17InspectorDOMAgentEPNS_22InspectorDebuggerAgentEPNS_14InspectorAgentE
</span><del>-__ZN7WebCore22InspectorProfilerAgent6createEPNS_19InstrumentingAgentsEPNS_21InspectorConsoleAgentEPNS_4PageEPNS_23InspectorCompositeStateEPNS_21InjectedScriptManagerE
-__ZN7WebCore22InspectorProfilerAgentC2EPNS_19InstrumentingAgentsEPNS_21InspectorConsoleAgentEPNS_23InspectorCompositeStateEPNS_21InjectedScriptManagerE
-__ZN7WebCore26InspectorHeapProfilerAgent6createEPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateEPNS_21InjectedScriptManagerE
</del><span class="cx"> __ZN7WebCore20InspectorWorkerAgent6createEPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateE
</span><span class="cx"> __ZN7WebCore20InspectorCanvasAgentC1EPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateEPNS_18InspectorPageAgentEPNS_21InjectedScriptManagerE
</span><span class="cx"> __ZN7WebCore19InspectorInputAgentC1EPNS_19InstrumentingAgentsEPNS_23InspectorCompositeStateEPNS_4PageE
</span><span class="lines">@@ -6499,10 +6496,6 @@
</span><span class="cx"> __ZN7WebCore17PageDebuggerAgentD0Ev
</span><span class="cx"> __ZN7WebCore22InspectorDebuggerAgentD2Ev
</span><span class="cx"> __ZN7WebCore25InspectorDOMDebuggerAgentD0Ev
</span><del>-__ZN7WebCore17PageProfilerAgentD0Ev
-__ZN7WebCore22InspectorProfilerAgentD2Ev
-__ZN7WebCore26InspectorHeapProfilerAgentD0Ev
-__ZN7WebCore26InspectorHeapProfilerAgentD2Ev
</del><span class="cx"> __ZN7WebCore20InspectorWorkerAgentD0Ev
</span><span class="cx"> __ZN7WebCore20InspectorWorkerAgentD2Ev
</span><span class="cx"> __ZN7WebCore20InspectorCanvasAgentD0Ev
</span><span class="lines">@@ -20997,7 +20990,6 @@
</span><span class="cx"> __ZTVN7WebCore12_GLOBAL__N_119ExternalStringsRootE
</span><span class="cx"> __ZTVN7WebCore12_GLOBAL__N_114CounterVisitorE
</span><span class="cx"> __ZTVN7WebCore18InspectorPageAgentE
</span><del>-__ZTVN7WebCore22InspectorProfilerAgentE
</del><span class="cx"> __ZTVN7WebCore22InspectorResourceAgentE
</span><span class="cx"> __ZTVN7WebCore21InspectorRuntimeAgentE
</span><span class="cx"> __ZTVN7WebCore14InspectorStyleE
</span><span class="lines">@@ -24383,7 +24375,6 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore17InspectorFrontendEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore23InspectorFrontendClientEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore26InspectorBackendDispatcherEEE
</span><del>-__ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore22InspectorProfilerAgentEEE
</del><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore22InspectorDebuggerAgentEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore18InspectorPageAgentEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore22InspectorResourceAgentEEE
</span><span class="lines">@@ -24454,9 +24445,6 @@
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13ScriptProfileEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore21InspectorConsoleAgentEEE
</span><span class="cx"> __ZTVN7WebCore8Protocol5ArrayINS0_8Profiler13ProfileHeaderEEE
</span><del>-__ZTVN7WebCore18InspectorBaseAgentINS_22InspectorProfilerAgentEEE
-__ZTVN7WebCore19WorkerProfilerAgentE
-__ZTVN7WebCore17PageProfilerAgentE
</del><span class="cx"> __ZTVN7WebCore18InspectorBaseAgentINS_22InspectorResourceAgentEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore8Protocol7Network9InitiatorEEE
</span><span class="cx"> __ZTVN3WTF21MemoryInstrumentation7WrapperIN7WebCore13XHRReplayDataEEE
</span><span class="lines">@@ -26460,7 +26448,6 @@
</span><span class="cx"> __ZN7WebCore18WebCoreMemoryTypes20InspectorMemoryAgentE
</span><span class="cx"> __ZN7WebCore18WebCoreMemoryTypes24InspectorDOMStorageAgentE
</span><span class="cx"> __ZN7WebCore18WebCoreMemoryTypes16InspectorOverlayE
</span><del>-__ZN7WebCore18WebCoreMemoryTypes22InspectorProfilerAgentE
</del><span class="cx"> __ZN7WebCore18WebCoreMemoryTypes22InspectorDebuggerAgentE
</span><span class="cx"> __ZN7WebCore18WebCoreMemoryTypes22InspectorResourceAgentE
</span><span class="cx"> __ZN7WebCore18WebCoreMemoryTypes10JSHeapUsedE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -18109,14 +18109,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\PageProfilerAgent.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\PageRuntimeAgent.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">@@ -18157,14 +18149,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\WebProfilerAgent.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\WorkerConsoleAgent.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">@@ -18205,14 +18189,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\WorkerProfilerAgent.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\WorkerRuntimeAgent.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">@@ -21303,19 +21279,16 @@
</span><span class="cx"> <ClInclude Include="..\inspector\NetworkResourcesData.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageDebuggerAgent.h" />
</span><del>- <ClInclude Include="..\inspector\PageProfilerAgent.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\PageRuntimeAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\PageScriptDebugServer.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\TimelineRecordFactory.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WebConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WebDebuggerAgent.h" />
</span><del>- <ClInclude Include="..\inspector\WebProfilerAgent.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\WebInjectedScriptHost.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WebInjectedScriptManager.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerConsoleAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerDebuggerAgent.h" />
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerInspectorController.h" />
</span><del>- <ClInclude Include="..\inspector\WorkerProfilerAgent.h" />
</del><span class="cx"> <ClInclude Include="..\inspector\WorkerRuntimeAgent.h" />
</span><span class="cx"> <ClInclude Include="..\mathml\MathMLElement.h" />
</span><span class="cx"> <ClInclude Include="..\mathml\MathMLInlineContainerElement.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -4836,9 +4836,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\PageDebuggerAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\PageProfilerAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\PageRuntimeAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4854,9 +4851,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\WebDebuggerAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\WebProfilerAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\WebInjectedScriptHost.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4872,9 +4866,6 @@
</span><span class="cx"> <ClCompile Include="..\inspector\WorkerInspectorController.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\inspector\WorkerProfilerAgent.cpp">
- <Filter>inspector</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\inspector\WorkerRuntimeAgent.cpp">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -12567,9 +12558,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\PageDebuggerAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\PageProfilerAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\PageRuntimeAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12585,9 +12573,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\WebDebuggerAgent.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\WebProfilerAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\WebInjectedScriptHost.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -12603,9 +12588,6 @@
</span><span class="cx"> <ClInclude Include="..\inspector\WorkerInspectorController.h">
</span><span class="cx"> <Filter>inspector</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\inspector\WorkerProfilerAgent.h">
- <Filter>inspector</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\inspector\WorkerRuntimeAgent.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 (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -951,12 +951,6 @@
</span><span class="cx"> 1CB4214B0AF2B2CA0085AD91 /* DOMElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E711490AC5D5340053270F /* DOMElementInternal.h */; };
</span><span class="cx"> 1CB4214C0AF2B2CA0085AD91 /* DOMHTMLElementInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 85E711580AC5D5340053270F /* DOMHTMLElementInternal.h */; };
</span><span class="cx"> 1CB4214D0AF2B2CA0085AD91 /* DOMRangeInternal.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 8538F05A0AD722F1006A81D1 /* DOMRangeInternal.h */; };
</span><del>- 1CC6B06C18F8526B0007ECCD /* WebProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CC6B06A18F8526B0007ECCD /* WebProfilerAgent.cpp */; };
- 1CC6B06D18F8526B0007ECCD /* WebProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC6B06B18F8526B0007ECCD /* WebProfilerAgent.h */; };
- 1CC6B07018F8687A0007ECCD /* PageProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CC6B06E18F8687A0007ECCD /* PageProfilerAgent.cpp */; };
- 1CC6B07118F8687A0007ECCD /* PageProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC6B06F18F8687A0007ECCD /* PageProfilerAgent.h */; };
- 1CC6B07418F893A20007ECCD /* WorkerProfilerAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CC6B07218F893A20007ECCD /* WorkerProfilerAgent.cpp */; };
- 1CC6B07518F893A20007ECCD /* WorkerProfilerAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CC6B07318F893A20007ECCD /* WorkerProfilerAgent.h */; };
</del><span class="cx"> 1CCA732210ADD44A00FD440D /* DOMHTMLInputElementPrivate.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 1CCA732110ADD43E00FD440D /* DOMHTMLInputElementPrivate.h */; };
</span><span class="cx"> 1CE83AC30ADAFFD7009354F6 /* DeleteButtonController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4C8EFF0AD85D87009475CE /* DeleteButtonController.cpp */; };
</span><span class="cx"> 1CE83AC40ADAFFD8009354F6 /* DeleteButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4C8F630AD8655D009475CE /* DeleteButton.cpp */; };
</span><span class="lines">@@ -7905,12 +7899,6 @@
</span><span class="cx"> 1CAF347E0A6C405200ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObject.h; sourceTree = "<group>"; };
</span><span class="cx"> 1CAF347F0A6C405200ABE06E /* WebScriptObject.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebScriptObject.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1CAF34800A6C405200ABE06E /* WebScriptObjectPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObjectPrivate.h; sourceTree = "<group>"; };
</span><del>- 1CC6B06A18F8526B0007ECCD /* WebProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProfilerAgent.cpp; sourceTree = "<group>"; };
- 1CC6B06B18F8526B0007ECCD /* WebProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProfilerAgent.h; sourceTree = "<group>"; };
- 1CC6B06E18F8687A0007ECCD /* PageProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageProfilerAgent.cpp; sourceTree = "<group>"; };
- 1CC6B06F18F8687A0007ECCD /* PageProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageProfilerAgent.h; sourceTree = "<group>"; };
- 1CC6B07218F893A20007ECCD /* WorkerProfilerAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerProfilerAgent.cpp; sourceTree = "<group>"; };
- 1CC6B07318F893A20007ECCD /* WorkerProfilerAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerProfilerAgent.h; sourceTree = "<group>"; };
</del><span class="cx"> 1CCA732110ADD43E00FD440D /* DOMHTMLInputElementPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMHTMLInputElementPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 1CD0B6200AABDB5000D0A3FF /* PublicDOMInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublicDOMInterfaces.h; sourceTree = "<group>"; };
</span><span class="cx"> 1CDD45E40BA9C84600F90147 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -15241,8 +15229,6 @@
</span><span class="cx"> F382088B147D35F90010BC06 /* PageConsoleAgent.h */,
</span><span class="cx"> F34742DA134362F000531BC2 /* PageDebuggerAgent.cpp */,
</span><span class="cx"> F34742DB134362F000531BC2 /* PageDebuggerAgent.h */,
</span><del>- 1CC6B06E18F8687A0007ECCD /* PageProfilerAgent.cpp */,
- 1CC6B06F18F8687A0007ECCD /* PageProfilerAgent.h */,
</del><span class="cx"> F382088C147D35F90010BC06 /* PageRuntimeAgent.cpp */,
</span><span class="cx"> F382088D147D35F90010BC06 /* PageRuntimeAgent.h */,
</span><span class="cx"> A5F36D3818F758720054C024 /* PageScriptDebugServer.cpp */,
</span><span class="lines">@@ -15259,16 +15245,12 @@
</span><span class="cx"> A5840E23187B8AC200843B10 /* WebInjectedScriptHost.h */,
</span><span class="cx"> A584FE2D1864CB8400843B10 /* WebInjectedScriptManager.cpp */,
</span><span class="cx"> A584FE2E1864CB8400843B10 /* WebInjectedScriptManager.h */,
</span><del>- 1CC6B06A18F8526B0007ECCD /* WebProfilerAgent.cpp */,
- 1CC6B06B18F8526B0007ECCD /* WebProfilerAgent.h */,
</del><span class="cx"> F382088E147D35F90010BC06 /* WorkerConsoleAgent.cpp */,
</span><span class="cx"> F382088F147D35F90010BC06 /* WorkerConsoleAgent.h */,
</span><span class="cx"> F34742DE1343631F00531BC2 /* WorkerDebuggerAgent.cpp */,
</span><span class="cx"> F34742DF1343631F00531BC2 /* WorkerDebuggerAgent.h */,
</span><span class="cx"> F36E07A21358A8BE00AACBC9 /* WorkerInspectorController.cpp */,
</span><span class="cx"> F36E07A31358A8BE00AACBC9 /* WorkerInspectorController.h */,
</span><del>- 1CC6B07218F893A20007ECCD /* WorkerProfilerAgent.cpp */,
- 1CC6B07318F893A20007ECCD /* WorkerProfilerAgent.h */,
</del><span class="cx"> F3820890147D35F90010BC06 /* WorkerRuntimeAgent.cpp */,
</span><span class="cx"> F3820891147D35F90010BC06 /* WorkerRuntimeAgent.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -24199,7 +24181,6 @@
</span><span class="cx"> 514B3F730C722047000530DF /* FileSystem.h in Headers */,
</span><span class="cx"> 26C17A3E1491D2D400D12BA2 /* FileSystemIOS.h in Headers */,
</span><span class="cx"> 976D6C8E122B8A3D001FD1F7 /* FileThread.h in Headers */,
</span><del>- 1CC6B06D18F8526B0007ECCD /* WebProfilerAgent.h in Headers */,
</del><span class="cx"> BC5EB69F0E81DAEB00B25965 /* FillLayer.h in Headers */,
</span><span class="cx"> 845E72F80FD261EE00A87D79 /* Filter.h in Headers */,
</span><span class="cx"> 08C9251A0FCC7C4A00480DEC /* FilterEffect.h in Headers */,
</span><span class="lines">@@ -25954,7 +25935,6 @@
</span><span class="cx"> 1AB09DB516AF5F6C008538E7 /* StorageStrategy.h in Headers */,
</span><span class="cx"> C5102D940FD9AA2D00FAFF04 /* StorageSyncManager.h in Headers */,
</span><span class="cx"> 511F231A0DC160DA004F0032 /* StorageThread.h in Headers */,
</span><del>- 1CC6B07118F8687A0007ECCD /* PageProfilerAgent.h in Headers */,
</del><span class="cx"> 3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */,
</span><span class="cx"> 3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */,
</span><span class="cx"> 81AC6C36131C57D30009A7E0 /* StringCallback.h in Headers */,
</span><span class="lines">@@ -26317,7 +26297,6 @@
</span><span class="cx"> 930FC68A1072B9280045293E /* TextRenderingMode.h in Headers */,
</span><span class="cx"> CDA07FC218E0A22B004699FA /* SystemSleepListenerMac.h in Headers */,
</span><span class="cx"> 93F198F608245E59001E9ABC /* TextResourceDecoder.h in Headers */,
</span><del>- 1CC6B07518F893A20007ECCD /* WorkerProfilerAgent.h in Headers */,
</del><span class="cx"> A824B4650E2EF2EA0081A7B7 /* TextRun.h in Headers */,
</span><span class="cx"> 448B1B7A0F3A2F9B0047A9E2 /* TextSizeAdjustment.h in Headers */,
</span><span class="cx"> B2C3DA4B0D006C1D00EF6F26 /* TextStream.h in Headers */,
</span><span class="lines">@@ -27612,7 +27591,6 @@
</span><span class="cx"> A8CFF6CB0A1561CD000A4234 /* EllipsisBox.cpp in Sources */,
</span><span class="cx"> F55B3DBB1251F12D003EF269 /* EmailInputType.cpp in Sources */,
</span><span class="cx"> F52AD5E41534245F0059FBE6 /* EmptyClients.cpp in Sources */,
</span><del>- 1CC6B07018F8687A0007ECCD /* PageProfilerAgent.cpp in Sources */,
</del><span class="cx"> A8EA7EC10A1945D000A8EF5F /* EntityReference.cpp in Sources */,
</span><span class="cx"> FD31609212B026F700C1A359 /* EqualPowerPanner.cpp in Sources */,
</span><span class="cx"> 2ECF7AE110162B5800427DE7 /* ErrorEvent.cpp in Sources */,
</span><span class="lines">@@ -28592,7 +28570,6 @@
</span><span class="cx"> B2FA3DDE0AB75A6F000E5AC4 /* JSSVGPathSegMovetoRel.cpp in Sources */,
</span><span class="cx"> B2FA3DE00AB75A6F000E5AC4 /* JSSVGPatternElement.cpp in Sources */,
</span><span class="cx"> 8542A7960AE5C94200DF58DF /* JSSVGPoint.cpp in Sources */,
</span><del>- 1CC6B06C18F8526B0007ECCD /* WebProfilerAgent.cpp in Sources */,
</del><span class="cx"> B2FA3DE20AB75A6F000E5AC4 /* JSSVGPointList.cpp in Sources */,
</span><span class="cx"> B2FA3DE50AB75A6F000E5AC4 /* JSSVGPolygonElement.cpp in Sources */,
</span><span class="cx"> B2FA3DE70AB75A6F000E5AC4 /* JSSVGPolylineElement.cpp in Sources */,
</span><span class="lines">@@ -28948,7 +28925,6 @@
</span><span class="cx"> FD31601912B0267600C1A359 /* PannerNode.cpp in Sources */,
</span><span class="cx"> 447958051643B4B2001E0A7F /* ParsedContentType.cpp in Sources */,
</span><span class="cx"> F55B3DC91251F12D003EF269 /* PasswordInputType.cpp in Sources */,
</span><del>- 1CC6B07418F893A20007ECCD /* WorkerProfilerAgent.cpp in Sources */,
</del><span class="cx"> E453901E0EAFCACA003695C8 /* PasteboardIOS.mm in Sources */,
</span><span class="cx"> 4B2709830AF2E5E00065127F /* PasteboardMac.mm in Sources */,
</span><span class="cx"> B275357F0B053814002CE64F /* Path.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorAllInOne.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/InspectorAllInOne.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> #include "NetworkResourcesData.cpp"
</span><span class="cx"> #include "PageConsoleAgent.cpp"
</span><span class="cx"> #include "PageDebuggerAgent.cpp"
</span><del>-#include "PageProfilerAgent.cpp"
</del><span class="cx"> #include "PageRuntimeAgent.cpp"
</span><span class="cx"> #include "PageScriptDebugServer.cpp"
</span><span class="cx"> #include "TimelineRecordFactory.cpp"
</span><span class="lines">@@ -65,9 +64,7 @@
</span><span class="cx"> #include "WebDebuggerAgent.cpp"
</span><span class="cx"> #include "WebInjectedScriptHost.cpp"
</span><span class="cx"> #include "WebInjectedScriptManager.cpp"
</span><del>-#include "WebProfilerAgent.cpp"
</del><span class="cx"> #include "WorkerConsoleAgent.cpp"
</span><span class="cx"> #include "WorkerDebuggerAgent.cpp"
</span><span class="cx"> #include "WorkerInspectorController.cpp"
</span><del>-#include "WorkerProfilerAgent.cpp"
</del><span class="cx"> #include "WorkerRuntimeAgent.cpp"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConsoleAgent.h"
</span><span class="cx"> #include "PageDebuggerAgent.h"
</span><del>-#include "PageProfilerAgent.h"
</del><span class="cx"> #include "PageRuntimeAgent.h"
</span><span class="cx"> #include "PageScriptDebugServer.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="lines">@@ -154,10 +153,6 @@
</span><span class="cx"> m_domDebuggerAgent = domDebuggerAgentPtr.get();
</span><span class="cx"> m_agents.append(WTF::move(domDebuggerAgentPtr));
</span><span class="cx">
</span><del>- auto profilerAgentPtr = std::make_unique<PageProfilerAgent>(m_instrumentingAgents.get(), &page);
- m_profilerAgent = profilerAgentPtr.get();
- m_agents.append(WTF::move(profilerAgentPtr));
-
</del><span class="cx"> m_agents.append(std::make_unique<InspectorApplicationCacheAgent>(m_instrumentingAgents.get(), pageAgent));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorWorkerAgent>(m_instrumentingAgents.get()));
</span><span class="cx"> m_agents.append(std::make_unique<InspectorLayerTreeAgent>(m_instrumentingAgents.get()));
</span><span class="lines">@@ -176,7 +171,6 @@
</span><span class="cx">
</span><span class="cx"> runtimeAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</span><span class="cx"> m_timelineAgent->setPageScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</span><del>- m_profilerAgent->setScriptDebugServer(&m_debuggerAgent->scriptDebugServer());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorController::~InspectorController()
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> class InspectorAgent;
</span><span class="cx"> class InspectorBackendDispatcher;
</span><span class="cx"> class InspectorFrontendChannel;
</span><del>-class InspectorProfilerAgent;
</del><span class="cx"> class InspectorObject;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -144,7 +143,6 @@
</span><span class="cx"> InspectorPageAgent* m_pageAgent;
</span><span class="cx"> PageDebuggerAgent* m_debuggerAgent;
</span><span class="cx"> InspectorDOMDebuggerAgent* m_domDebuggerAgent;
</span><del>- Inspector::InspectorProfilerAgent* m_profilerAgent;
</del><span class="cx"> InspectorTimelineAgent* m_timelineAgent;
</span><span class="cx">
</span><span class="cx"> RefPtr<Inspector::InspectorBackendDispatcher> m_inspectorBackendDispatcher;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> #include <inspector/ScriptArguments.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <inspector/agents/InspectorDebuggerAgent.h>
</span><del>-#include <inspector/agents/InspectorProfilerAgent.h>
</del><span class="cx"> #include <profiler/Profile.h>
</span><span class="cx"> #include <runtime/ConsoleTypes.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="lines">@@ -769,9 +768,6 @@
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents->inspectorResourceAgent())
</span><span class="cx"> resourceAgent->mainFrameNavigated(loader);
</span><span class="cx">
</span><del>- if (InspectorProfilerAgent* profilerAgent = instrumentingAgents->inspectorProfilerAgent())
- profilerAgent->reset();
-
</del><span class="cx"> if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
</span><span class="cx"> cssAgent->reset();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -68,7 +68,6 @@
</span><span class="cx"> , m_inspectorDebuggerAgent(nullptr)
</span><span class="cx"> , m_pageDebuggerAgent(nullptr)
</span><span class="cx"> , m_inspectorDOMDebuggerAgent(nullptr)
</span><del>- , m_inspectorProfilerAgent(nullptr)
</del><span class="cx"> , m_inspectorWorkerAgent(nullptr)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -97,7 +96,6 @@
</span><span class="cx"> m_inspectorDebuggerAgent = nullptr;
</span><span class="cx"> m_pageDebuggerAgent = nullptr;
</span><span class="cx"> m_inspectorDOMDebuggerAgent = nullptr;
</span><del>- m_inspectorProfilerAgent = nullptr;
</del><span class="cx"> m_inspectorWorkerAgent = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInstrumentingAgentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InstrumentingAgents.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/InstrumentingAgents.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx"> class InspectorAgent;
</span><span class="cx"> class InspectorDebuggerAgent;
</span><del>-class InspectorProfilerAgent;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -133,9 +132,6 @@
</span><span class="cx"> InspectorDOMDebuggerAgent* inspectorDOMDebuggerAgent() const { return m_inspectorDOMDebuggerAgent; }
</span><span class="cx"> void setInspectorDOMDebuggerAgent(InspectorDOMDebuggerAgent* agent) { m_inspectorDOMDebuggerAgent = agent; }
</span><span class="cx">
</span><del>- Inspector::InspectorProfilerAgent* inspectorProfilerAgent() const { return m_inspectorProfilerAgent; }
- void setInspectorProfilerAgent(Inspector::InspectorProfilerAgent* agent) { m_inspectorProfilerAgent = agent; }
-
</del><span class="cx"> InspectorWorkerAgent* inspectorWorkerAgent() const { return m_inspectorWorkerAgent; }
</span><span class="cx"> void setInspectorWorkerAgent(InspectorWorkerAgent* agent) { m_inspectorWorkerAgent = agent; }
</span><span class="cx">
</span><span class="lines">@@ -169,7 +165,6 @@
</span><span class="cx"> Inspector::InspectorDebuggerAgent* m_inspectorDebuggerAgent;
</span><span class="cx"> PageDebuggerAgent* m_pageDebuggerAgent;
</span><span class="cx"> InspectorDOMDebuggerAgent* m_inspectorDOMDebuggerAgent;
</span><del>- Inspector::InspectorProfilerAgent* m_inspectorProfilerAgent;
</del><span class="cx"> InspectorWorkerAgent* m_inspectorWorkerAgent;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageProfilerAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/PageProfilerAgent.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageProfilerAgent.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/PageProfilerAgent.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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"
-#include "PageProfilerAgent.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "JSDOMWindow.h"
-#include "MainFrame.h"
-#include "Page.h"
-
-using namespace Inspector;
-
-namespace WebCore {
-
-PageProfilerAgent::PageProfilerAgent(InstrumentingAgents* instrumentingAgents, Page* page)
- : WebProfilerAgent(instrumentingAgents)
- , m_inspectedPage(page)
-{
-}
-
-JSC::ExecState* PageProfilerAgent::profilingGlobalExecState() const
-{
- return toJSDOMWindow(&m_inspectedPage->mainFrame(), debuggerWorld())->globalExec();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorPageProfilerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/PageProfilerAgent.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/PageProfilerAgent.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/PageProfilerAgent.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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 PageProfilerAgent_h
-#define PageProfilerAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "WebProfilerAgent.h"
-
-namespace WebCore {
-
-class Page;
-
-class PageProfilerAgent final : public WebProfilerAgent {
- WTF_MAKE_NONCOPYABLE(PageProfilerAgent);
- WTF_MAKE_FAST_ALLOCATED;
-public:
- PageProfilerAgent(InstrumentingAgents*, Page*);
- virtual ~PageProfilerAgent() { }
-
-private:
- virtual JSC::ExecState* profilingGlobalExecState() const override;
-
- Page* m_inspectedPage;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(PageProfilerAgent_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -37,16 +37,15 @@
</span><span class="cx">
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "FloatQuad.h"
</span><ins>+#include "InspectorWebProtocolTypes.h"
</ins><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "JSMainThreadExecState.h"
</span><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><del>-#include <inspector/InspectorValues.h>
</del><span class="cx"> #include <inspector/ScriptBreakpoint.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="cx"> #include <inspector/ScriptCallStackFactory.h>
</span><del>-#include <inspector/agents/InspectorProfilerAgent.h>
</del><span class="cx"> #include <profiler/Profile.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx">
</span><span class="lines">@@ -271,9 +270,61 @@
</span><span class="cx"> data->setArray("root", createQuad(quad));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static PassRefPtr<Protocol::Timeline::CPUProfileNodeCall> buildInspectorObject(const JSC::ProfileNode::Call& call)
+{
+ RefPtr<Protocol::Timeline::CPUProfileNodeCall> result = Protocol::Timeline::CPUProfileNodeCall::create()
+ .setStartTime(call.startTime())
+ .setTotalTime(call.totalTime());
+ return result.release();
+}
+
+static PassRefPtr<Protocol::Timeline::CPUProfileNode> buildInspectorObject(const JSC::ProfileNode* node)
+{
+ RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNodeCall>> calls = Protocol::Array<Protocol::Timeline::CPUProfileNodeCall>::create();
+ for (const JSC::ProfileNode::Call& call : node->calls())
+ calls->addItem(buildInspectorObject(call));
+
+ RefPtr<Protocol::Timeline::CPUProfileNode> result = Protocol::Timeline::CPUProfileNode::create()
+ .setId(node->id())
+ .setCalls(calls.release());
+
+ if (!node->functionName().isEmpty())
+ result->setFunctionName(node->functionName());
+
+ if (!node->url().isEmpty()) {
+ result->setUrl(node->url());
+ result->setLineNumber(node->lineNumber());
+ result->setColumnNumber(node->columnNumber());
+ }
+
+ if (!node->children().isEmpty()) {
+ RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNode>> children = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
+ for (RefPtr<JSC::ProfileNode> profileNode : node->children())
+ children->addItem(buildInspectorObject(profileNode.get()));
+ result->setChildren(children);
+ }
+
+ return result.release();
+}
+
+static PassRefPtr<Protocol::Timeline::CPUProfile> buildProfileInspectorObject(const JSC::Profile* profile)
+{
+ RefPtr<Protocol::Array<Protocol::Timeline::CPUProfileNode>> rootNodes = Protocol::Array<Protocol::Timeline::CPUProfileNode>::create();
+ for (RefPtr<JSC::ProfileNode> profileNode : profile->head()->children())
+ rootNodes->addItem(buildInspectorObject(profileNode.get()));
+
+ RefPtr<Protocol::Timeline::CPUProfile> result = Protocol::Timeline::CPUProfile::create()
+ .setRootNodes(rootNodes);
+
+ if (profile->idleTime())
+ result->setIdleTime(profile->idleTime());
+
+ return result.release();
+}
+
</ins><span class="cx"> void TimelineRecordFactory::appendProfile(InspectorObject* data, PassRefPtr<JSC::Profile> profile)
</span><span class="cx"> {
</span><del>- data->setValue(ASCIILiteral("profile"), InspectorProfilerAgent::buildProfileInspectorObject(profile.get()));
</del><ins>+ data->setValue(ASCIILiteral("profile"), buildProfileInspectorObject(profile.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebProfilerAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WebProfilerAgent.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebProfilerAgent.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/WebProfilerAgent.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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"
-#include "WebProfilerAgent.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "InstrumentingAgents.h"
-
-using namespace Inspector;
-
-namespace WebCore {
-
-WebProfilerAgent::WebProfilerAgent(InstrumentingAgents* instrumentingAgents)
- : InspectorProfilerAgent()
- , m_instrumentingAgents(instrumentingAgents)
-{
-}
-
-void WebProfilerAgent::enable(ShouldRecompile shouldRecompile)
-{
- InspectorProfilerAgent::enable(shouldRecompile);
- m_instrumentingAgents->setInspectorProfilerAgent(this);
-}
-
-void WebProfilerAgent::disable(ShouldRecompile shouldRecompile)
-{
- InspectorProfilerAgent::disable(shouldRecompile);
- m_instrumentingAgents->setInspectorProfilerAgent(nullptr);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWebProfilerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WebProfilerAgent.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WebProfilerAgent.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/WebProfilerAgent.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,55 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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 WebProfilerAgent_h
-#define WebProfilerAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include <inspector/agents/InspectorProfilerAgent.h>
-
-namespace WebCore {
-
-class InstrumentingAgents;
-
-class WebProfilerAgent : public Inspector::InspectorProfilerAgent {
- WTF_MAKE_NONCOPYABLE(WebProfilerAgent);
- WTF_MAKE_FAST_ALLOCATED;
-public:
- WebProfilerAgent(InstrumentingAgents*);
- virtual ~WebProfilerAgent() { }
-
- virtual void enable(ShouldRecompile) override final;
- virtual void disable(ShouldRecompile) override final;
-
-protected:
- InstrumentingAgents* m_instrumentingAgents;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(WebProfilerAgent_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/WorkerInspectorController.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/WorkerInspectorController.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> #include "WorkerConsoleAgent.h"
</span><span class="cx"> #include "WorkerDebuggerAgent.h"
</span><span class="cx"> #include "WorkerGlobalScope.h"
</span><del>-#include "WorkerProfilerAgent.h"
</del><span class="cx"> #include "WorkerReportingProxy.h"
</span><span class="cx"> #include "WorkerRuntimeAgent.h"
</span><span class="cx"> #include "WorkerThread.h"
</span><span class="lines">@@ -95,10 +94,6 @@
</span><span class="cx"> m_runtimeAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
</span><span class="cx"> m_agents.append(WTF::move(debuggerAgent));
</span><span class="cx">
</span><del>- auto profilerAgent = std::make_unique<WorkerProfilerAgent>(m_instrumentingAgents.get(), &workerGlobalScope);
- profilerAgent->setScriptDebugServer(&debuggerAgent->scriptDebugServer());
- m_agents.append(WTF::move(profilerAgent));
-
</del><span class="cx"> m_agents.append(std::make_unique<InspectorTimelineAgent>(m_instrumentingAgents.get(), nullptr, InspectorTimelineAgent::WorkerInspector, nullptr));
</span><span class="cx"> m_agents.append(WTF::move(consoleAgent));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerProfilerAgentcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerProfilerAgent.cpp (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerProfilerAgent.cpp 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/WorkerProfilerAgent.cpp 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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"
-#include "WorkerProfilerAgent.h"
-
-#if ENABLE(INSPECTOR)
-
-#include "JSDOMWindow.h"
-#include "MainFrame.h"
-#include "Page.h"
-#include "ScriptState.h"
-
-using namespace Inspector;
-
-namespace WebCore {
-
-WorkerProfilerAgent::WorkerProfilerAgent(InstrumentingAgents* instrumentingAgents, WorkerGlobalScope* workerGlobalScope)
- : WebProfilerAgent(instrumentingAgents)
- , m_workerGlobalScope(workerGlobalScope)
-{
-}
-
-JSC::ExecState* WorkerProfilerAgent::profilingGlobalExecState() const
-{
- return execStateFromWorkerGlobalScope(m_workerGlobalScope);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorWorkerProfilerAgenth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/inspector/WorkerProfilerAgent.h (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/WorkerProfilerAgent.h 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/WorkerProfilerAgent.h 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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 WorkerProfilerAgent_h
-#define WorkerProfilerAgent_h
-
-#if ENABLE(INSPECTOR)
-
-#include "WebProfilerAgent.h"
-
-namespace WebCore {
-
-class WorkerGlobalScope;
-
-class WorkerProfilerAgent final : public WebProfilerAgent {
- WTF_MAKE_NONCOPYABLE(WorkerProfilerAgent);
- WTF_MAKE_FAST_ALLOCATED;
-public:
- WorkerProfilerAgent(InstrumentingAgents*, WorkerGlobalScope*);
- virtual ~WorkerProfilerAgent() { }
-
-private:
- virtual JSC::ExecState* profilingGlobalExecState() const override;
-
- WorkerGlobalScope* m_workerGlobalScope;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(INSPECTOR)
-
-#endif // !defined(WorkerProfilerAgent_h)
</del></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Timeline.json (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Timeline.json 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebCore/inspector/protocol/Timeline.json 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -17,6 +17,38 @@
</span><span class="cx"> { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." }
</span><span class="cx"> ],
</span><span class="cx"> "description": "Timeline record contains information about the recorded activity."
</span><ins>+ },
+ {
+ "id": "CPUProfileNodeCall",
+ "type": "object",
+ "description": "CPU Profile call info. Holds time information for a specific call that happened on a node.",
+ "properties": [
+ { "name": "startTime", "type": "number", "description": "Start time for the call." },
+ { "name": "totalTime", "type": "number", "description": "Total execution time for the call." }
+ ]
+ },
+ {
+ "id": "CPUProfileNode",
+ "type": "object",
+ "description": "CPU Profile node. Holds callsite information, execution statistics and child nodes.",
+ "properties": [
+ { "name": "id", "type": "integer", "description": "Unique identifier for this call site." },
+ { "name": "calls", "type": "array", "items": { "$ref": "CPUProfileNodeCall" }, "description": "Calls making up this node." },
+ { "name": "functionName", "type": "string", "optional": true, "description": "Function name." },
+ { "name": "url", "type": "string", "optional": true, "description": "URL." },
+ { "name": "lineNumber", "type": "integer", "optional": true, "description": "Line number." },
+ { "name": "columnNumber", "type": "integer", "optional": true, "description": "Column number." },
+ { "name": "children", "type": "array", "items": { "$ref": "CPUProfileNode" }, "optional": true, "description": "Child nodes." }
+ ]
+ },
+ {
+ "id": "CPUProfile",
+ "type": "object",
+ "description": "Profile.",
+ "properties": [
+ { "name": "rootNodes", "type": "array", "items": { "$ref": "CPUProfileNode" }, "description": "Top level nodes in the stack." },
+ { "name": "idleTime", "type": "number", "optional": true }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "commands": [
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIeslintrc"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/.eslintrc (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/.eslintrc 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/.eslintrc 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> "Map": true,
</span><span class="cx"> "NetworkAgent": true,
</span><span class="cx"> "PageAgent": true,
</span><del>- "ProfilerAgent": true,
</del><span class="cx"> "ReplayAgent": true,
</span><span class="cx"> "RuntimeAgent": true,
</span><span class="cx"> "TimelineAgent": true,
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-09-02 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove ProfilerAgent and legacy profiler files in the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=136462
+
+ Reviewed by Timothy Hatcher.
+
+ The legacy profiler manager didn't do anything, and its views and models
+ have been superseded by new views and models based on the Timeline classes.
+
+ * .eslintrc:
+ * UserInterface/Base/Main.js:
+ (WebInspector.loaded):
+ (WebInspector.openURL): Remove profile URL handling code.
+ * UserInterface/Controllers/LegacyProfileManager.js: Removed.
+ * UserInterface/Main.html:
+ * UserInterface/Protocol/ConsoleObserver.js:
+ (WebInspector.ConsoleObserver.prototype.messageAdded):
+ * UserInterface/Protocol/InspectorFrontendAPI.js:
+ (InspectorFrontendAPI.isProfilingJavaScript): Deleted.
+ (InspectorFrontendAPI.startProfilingJavaScript): Deleted.
+ (InspectorFrontendAPI.stopProfilingJavaScript): Deleted.
+ * UserInterface/Protocol/LegacyProfilerObserver.js: Removed.
+ * UserInterface/Views/LegacyBottomUpProfileDataGridTree.js: Removed.
+ * UserInterface/Views/LegacyJavaScriptProfileObject.js: Removed.
+ * UserInterface/Views/LegacyJavaScriptProfileType.js: Removed.
+ * UserInterface/Views/LegacyJavaScriptProfileView.css: Removed.
+ * UserInterface/Views/LegacyJavaScriptProfileView.js: Removed.
+ * UserInterface/Views/LegacyProfileDataGridTree.js: Removed.
+ * UserInterface/Views/LegacyProfileObject.js: Removed.
+ * UserInterface/Views/LegacyProfileType.js: Removed.
+ * UserInterface/Views/LegacyProfileView.css: Removed.
+ * UserInterface/Views/LegacyProfileView.js: Removed.
+ * UserInterface/Views/LegacyTopDownProfileDataGridTree.js: Removed.
+
</ins><span class="cx"> 2014-08-29 Saam Barati <saambarati1@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Create a UI for displaying JavaScript type information
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -76,8 +76,6 @@
</span><span class="cx"> InspectorBackend.registerApplicationCacheDispatcher(new WebInspector.ApplicationCacheObserver);
</span><span class="cx"> if (InspectorBackend.registerTimelineDispatcher)
</span><span class="cx"> InspectorBackend.registerTimelineDispatcher(new WebInspector.TimelineObserver);
</span><del>- if (InspectorBackend.registerProfilerDispatcher)
- InspectorBackend.registerProfilerDispatcher(new WebInspector.LegacyProfilerObserver);
</del><span class="cx"> if (InspectorBackend.registerCSSDispatcher)
</span><span class="cx"> InspectorBackend.registerCSSDispatcher(new WebInspector.CSSObserver);
</span><span class="cx"> if (InspectorBackend.registerLayerTreeDispatcher)
</span><span class="lines">@@ -111,7 +109,6 @@
</span><span class="cx"> this.runtimeManager = new WebInspector.RuntimeManager;
</span><span class="cx"> this.applicationCacheManager = new WebInspector.ApplicationCacheManager;
</span><span class="cx"> this.timelineManager = new WebInspector.TimelineManager;
</span><del>- this.legacyProfileManager = new WebInspector.LegacyProfileManager;
</del><span class="cx"> this.debuggerManager = new WebInspector.DebuggerManager;
</span><span class="cx"> this.sourceMapManager = new WebInspector.SourceMapManager;
</span><span class="cx"> this.layerTreeManager = new WebInspector.LayerTreeManager;
</span><span class="lines">@@ -502,20 +499,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var parsedURL = parseURL(url);
- if (parsedURL.scheme === WebInspector.LegacyProfileType.ProfileScheme) {
- var profileType = parsedURL.host.toUpperCase();
- var profileTitle = parsedURL.path;
-
- // The path of of the profile URL starts with a slash, remove it, so
- // we can get the actual title.
- console.assert(profileTitle[0] === "/");
- profileTitle = profileTitle.substring(1);
-
- this.timelineSidebarPanel.showProfile(profileType, profileTitle);
- return;
- }
-
</del><span class="cx"> var searchChildFrames = false;
</span><span class="cx"> if (!frame) {
</span><span class="cx"> frame = this.frameResourceManager.mainFrame;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersLegacyProfileManagerjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Controllers/LegacyProfileManager.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/LegacyProfileManager.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/LegacyProfileManager.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,182 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-WebInspector.LegacyProfileManager = function()
-{
- WebInspector.Object.call(this);
-
- this._javaScriptProfileType = new WebInspector.LegacyJavaScriptProfileType;
-
- if (window.ProfilerAgent) {
- ProfilerAgent.enable();
- ProfilerAgent.getProfileHeaders();
- }
-
- WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
-
- this.initialize();
-};
-
-WebInspector.LegacyProfileManager.Event = {
- ProfileWasAdded: "profile-manager-profile-was-added",
- ProfileWasUpdated: "profile-manager-profile-was-updated",
- ProfilingStarted: "profile-manager-profiling-started",
- ProfilingEnded: "profile-manager-profiling-ended",
- ProfilingInterrupted: "profile-manager-profiling-interrupted",
- Cleared: "profile-manager-cleared"
-};
-
-WebInspector.LegacyProfileManager.UserInitiatedProfileName = "org.webkit.profiles.user-initiated";
-
-WebInspector.LegacyProfileManager.prototype = {
- constructor: WebInspector.LegacyProfileManager,
-
- // Public
-
- initialize: function()
- {
- this._checkForInterruptions();
-
- this._recordingJavaScriptProfile = null;
-
- this._isProfiling = false;
-
- this.dispatchEventToListeners(WebInspector.LegacyProfileManager.Event.Cleared);
- },
-
- isProfilingJavaScript: function()
- {
- return this._javaScriptProfileType.isRecordingProfile();
- },
-
- startProfilingJavaScript: function()
- {
- this._javaScriptProfileType.startRecordingProfile();
- },
-
- stopProfilingJavaScript: function()
- {
- this._javaScriptProfileType.stopRecordingProfile();
- },
-
- profileWasStartedFromConsole: function(title)
- {
- this.setRecordingJavaScriptProfile(true, true);
-
- if (title.indexOf(WebInspector.LegacyProfileManager.UserInitiatedProfileName) === -1) {
- this._recordingJavaScriptProfile.title = title;
- this.dispatchEventToListeners(WebInspector.LegacyProfileManager.Event.ProfileWasUpdated, {profile: this._recordingJavaScriptProfile});
- }
- },
-
- profileWasEndedFromConsole: function()
- {
- this.setRecordingJavaScriptProfile(false, true);
- },
-
- addJavaScriptProfile: function(profile)
- {
- console.assert(this._recordingJavaScriptProfile);
- if (!this._recordingJavaScriptProfile)
- return;
-
- this._recordingJavaScriptProfile.type = profile.typeId;
- this._recordingJavaScriptProfile.title = profile.title;
- this._recordingJavaScriptProfile.id = profile.uid;
- this._recordingJavaScriptProfile.recording = false;
-
- this.dispatchEventToListeners(WebInspector.LegacyProfileManager.Event.ProfileWasUpdated, {profile: this._recordingJavaScriptProfile});
-
- // We want to reset _recordingJavaScriptProfile so that we can identify
- // interruptions, but we also want to keep track of the last profile
- // we've recorded so that we can provide it as data to the ProfilingEnded event
- // we'll dispatch in setRecordingJavaScriptProfile().
- this._lastJavaScriptProfileAdded = this._recordingJavaScriptProfile;
- this._recordingJavaScriptProfile = null;
- },
-
- setRecordingJavaScriptProfile: function(isProfiling, fromConsole)
- {
- if (this._isProfiling === isProfiling)
- return;
-
- this._isProfiling = isProfiling;
-
- // We've interrupted the current JS profile due to a page reload. Return
- // now and _attemptToResumeProfiling will pick things up after the reload.
- if (!isProfiling && !!this._recordingJavaScriptProfile)
- return;
-
- if (isProfiling && !this._recordingJavaScriptProfile)
- this._recordingJavaScriptProfile = new WebInspector.LegacyJavaScriptProfileObject(WebInspector.LegacyProfileManager.UserInitiatedProfileName, -1, true);
-
- if (isProfiling) {
- this.dispatchEventToListeners(WebInspector.LegacyProfileManager.Event.ProfileWasAdded, {profile: this._recordingJavaScriptProfile});
- if (!fromConsole)
- this.dispatchEventToListeners(WebInspector.LegacyProfileManager.Event.ProfilingStarted);
- } else {
- this.dispatchEventToListeners(WebInspector.LegacyProfileManager.Event.ProfilingEnded, {
- profile: this._lastJavaScriptProfileAdded,
- fromConsole: fromConsole
- });
- this._lastJavaScriptProfileAdded = null;
- }
- },
-
- // Private
-
- _mainResourceDidChange: function(event)
- {
- console.assert(event.target instanceof WebInspector.Frame);
-
- if (!event.target.isMainFrame())
- return;
-
- var oldMainResource = event.data.oldMainResource;
- var newMainResource = event.target.mainResource;
- if (oldMainResource.url !== newMainResource.url)
- this.initialize();
- else
- this._attemptToResumeProfiling();
- },
-
- _checkForInterruptions: function()
- {
- if (this._recordingJavaScriptProfile) {
- this.dispatchEventToListeners(WebInspector.LegacyProfileManager.Event.ProfilingInterrupted, {profile: this._recordingJavaScriptProfile});
- this._javaScriptProfileType.setRecordingProfile(false);
- }
- },
-
- _attemptToResumeProfiling: function()
- {
- this._checkForInterruptions();
-
- if (this._recordingJavaScriptProfile)
- this.startProfilingJavaScript();
- }
-};
-
-WebInspector.LegacyProfileManager.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -90,8 +90,6 @@
</span><span class="cx"> <link rel="stylesheet" href="Views/LayerTreeSidebarPanel.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/LayoutTimelineOverviewGraph.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/LayoutTimelineView.css">
</span><del>- <link rel="stylesheet" href="Views/LegacyJavaScriptProfileView.css">
- <link rel="stylesheet" href="Views/LegacyProfileView.css">
</del><span class="cx"> <link rel="stylesheet" href="Views/LogContentView.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/LogIcon.css">
</span><span class="cx"> <link rel="stylesheet" href="Views/Main.css">
</span><span class="lines">@@ -189,7 +187,6 @@
</span><span class="cx"> <script src="Protocol/InspectorFrontendHostStub.js"></script>
</span><span class="cx"> <script src="Protocol/InspectorObserver.js"></script>
</span><span class="cx"> <script src="Protocol/LayerTreeObserver.js"></script>
</span><del>- <script src="Protocol/LegacyProfilerObserver.js"></script>
</del><span class="cx"> <script src="Protocol/LoadInspectorBackendCommands.js"></script>
</span><span class="cx"> <script src="Protocol/MessageDispatcher.js"></script>
</span><span class="cx"> <script src="Protocol/NetworkObserver.js"></script>
</span><span class="lines">@@ -281,10 +278,6 @@
</span><span class="cx"> <script src="Views/DataGrid.js"></script>
</span><span class="cx"> <script src="Views/DetailsSectionRow.js"></script>
</span><span class="cx"> <script src="Views/HierarchicalPathComponent.js"></script>
</span><del>- <script src="Views/LegacyProfileDataGridTree.js"></script>
- <script src="Views/LegacyProfileObject.js"></script>
- <script src="Views/LegacyProfileType.js"></script>
- <script src="Views/LegacyProfileView.js"></script>
</del><span class="cx"> <script src="Views/NavigationItem.js"></script>
</span><span class="cx"> <script src="Views/Section.js"></script>
</span><span class="cx"> <script src="Views/SidebarPanel.js"></script>
</span><span class="lines">@@ -401,11 +394,6 @@
</span><span class="cx"> <script src="Views/LayoutTimelineDataGridNode.js"></script>
</span><span class="cx"> <script src="Views/LayoutTimelineOverviewGraph.js"></script>
</span><span class="cx"> <script src="Views/LayoutTimelineView.js"></script>
</span><del>- <script src="Views/LegacyBottomUpProfileDataGridTree.js"></script>
- <script src="Views/LegacyJavaScriptProfileObject.js"></script>
- <script src="Views/LegacyJavaScriptProfileType.js"></script>
- <script src="Views/LegacyJavaScriptProfileView.js"></script>
- <script src="Views/LegacyTopDownProfileDataGridTree.js"></script>
</del><span class="cx"> <script src="Views/LogContentView.js"></script>
</span><span class="cx"> <script src="Views/LogTreeElement.js"></script>
</span><span class="cx"> <script src="Views/MetricsStyleDetailsPanel.js"></script>
</span><span class="lines">@@ -487,7 +475,6 @@
</span><span class="cx"> <script src="Controllers/JavaScriptLogViewController.js"></script>
</span><span class="cx"> <script src="Controllers/JavaScriptRuntimeCompletionProvider.js"></script>
</span><span class="cx"> <script src="Controllers/LayerTreeManager.js"></script>
</span><del>- <script src="Controllers/LegacyProfileManager.js"></script>
</del><span class="cx"> <script src="Controllers/LogManager.js"></script>
</span><span class="cx"> <script src="Controllers/ProbeManager.js"></script>
</span><span class="cx"> <script src="Controllers/ReplayManager.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolConsoleObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/ConsoleObserver.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -38,13 +38,6 @@
</span><span class="cx"> if (message.level === "warning" || message.level === "error")
</span><span class="cx"> WebInspector.issueManager.issueWasAdded(message.source, message.level, message.text, message.url, message.line, message.column || 0, message.parameters);
</span><span class="cx">
</span><del>- if (message.url === "[native code]") {
- if (message.type === "profile")
- WebInspector.legacyProfileManager.profileWasStartedFromConsole(message.text);
- else if (message.type === "profileEnd")
- WebInspector.legacyProfileManager.profileWasEndedFromConsole();
- }
-
</del><span class="cx"> if (message.source === "console-api" && message.type === "clear")
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolInspectorFrontendAPIjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -68,22 +68,6 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- isProfilingJavaScript: function()
- {
- return WebInspector.legacyProfileManager.isProfilingJavaScript();
- },
-
- startProfilingJavaScript: function()
- {
- WebInspector.legacyProfileManager.startProfilingJavaScript();
- },
-
- stopProfilingJavaScript: function()
- {
- WebInspector.timelineSidebarPanel.show();
- WebInspector.legacyProfileManager.stopProfilingJavaScript();
- },
-
</del><span class="cx"> setDockSide: function(side)
</span><span class="cx"> {
</span><span class="cx"> WebInspector.updateDockedState(side);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLegacyProfilerObserverjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Protocol/LegacyProfilerObserver.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/LegacyProfilerObserver.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/LegacyProfilerObserver.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,68 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-WebInspector.LegacyProfilerObserver = function()
-{
- WebInspector.Object.call(this);
-};
-
-WebInspector.LegacyProfilerObserver.prototype = {
- constructor: WebInspector.LegacyProfilerObserver,
-
- // Events defined by the "Profiler" domain.
-
- resetProfiles: function()
- {
- // FIXME: Implement this.
- },
-
- addProfileHeader: function(profile)
- {
- WebInspector.legacyProfileManager.addJavaScriptProfile(profile);
- },
-
- addHeapSnapshotChunk: function(uid, chunk)
- {
- // FIXME: Implement this (we need heap snapshots).
- },
-
- finishHeapSnapshot: function(uid)
- {
- // FIXME: Implement this (we need heap snapshots).
- },
-
- setRecordingProfile: function(isProfiling)
- {
- WebInspector.legacyProfileManager.setRecordingJavaScriptProfile(isProfiling);
- },
-
- reportHeapSnapshotProgress: function(done, total)
- {
- // FIXME: Implement this (we need heap snapshots).
- }
-
-};
-
-WebInspector.LegacyProfilerObserver.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyBottomUpProfileDataGridTreejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyBottomUpProfileDataGridTree.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyBottomUpProfileDataGridTree.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyBottomUpProfileDataGridTree.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,265 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 280 North Inc. All Rights Reserved.
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
- */
-
-// Bottom Up Profiling shows the entire callstack backwards:
-// The root node is a representation of each individual function called, and each child of that node represents
-// a reverse-callstack showing how many of those calls came from it. So, unlike top-down, the statistics in
-// each child still represent the root node. We have to be particularly careful of recursion with this mode
-// because a root node can represent itself AND an ancestor.
-
-WebInspector.LegacyBottomUpProfileDataGridNode = function(profileNode, owningTree)
-{
- WebInspector.LegacyProfileDataGridNode.call(this, profileNode, owningTree, this._willHaveChildren(profileNode));
-
- this._remainingNodeInfos = [];
-}
-
-WebInspector.LegacyBottomUpProfileDataGridNode.prototype = {
- _takePropertiesFromProfileDataGridNode: function(profileDataGridNode)
- {
- this._save();
-
- this.selfTime = profileDataGridNode.selfTime;
- this.totalTime = profileDataGridNode.totalTime;
- this.numberOfCalls = profileDataGridNode.numberOfCalls;
- },
-
- // When focusing, we keep just the members of the callstack.
- _keepOnlyChild: function(child)
- {
- this._save();
-
- this.removeChildren();
- this.appendChild(child);
- },
-
- _exclude: function(aCallUID)
- {
- if (this._remainingNodeInfos)
- this._populate();
-
- this._save();
-
- var children = this.children;
- var index = this.children.length;
-
- while (index--)
- children[index]._exclude(aCallUID);
-
- var child = this.childrenByCallUID[aCallUID];
-
- if (child)
- this._merge(child, true);
- },
-
- _restore: function()
- {
- WebInspector.LegacyProfileDataGridNode.prototype._restore();
-
- if (!this.children.length)
- this.hasChildren = this._willHaveChildren();
- },
-
- _merge: function(child, shouldAbsorb)
- {
- this.selfTime -= child.selfTime;
-
- WebInspector.LegacyProfileDataGridNode.prototype._merge.call(this, child, shouldAbsorb);
- },
-
- _sharedPopulate: function()
- {
- var remainingNodeInfos = this._remainingNodeInfos;
- var count = remainingNodeInfos.length;
-
- for (var index = 0; index < count; ++index) {
- var nodeInfo = remainingNodeInfos[index];
- var ancestor = nodeInfo.ancestor;
- var focusNode = nodeInfo.focusNode;
- var child = this.findChild(ancestor);
-
- // If we already have this child, then merge the data together.
- if (child) {
- var totalTimeAccountedFor = nodeInfo.totalTimeAccountedFor;
-
- child.selfTime += focusNode.selfTime;
- child.numberOfCalls += focusNode.numberOfCalls;
-
- if (!totalTimeAccountedFor)
- child.totalTime += focusNode.totalTime;
- } else {
- // If not, add it as a true ancestor.
- // In heavy mode, we take our visual identity from ancestor node...
- child = new WebInspector.LegacyBottomUpProfileDataGridNode(ancestor, this.tree, false, this.showTimeAsPercent);
-
- if (ancestor !== focusNode) {
- // but the actual statistics from the "root" node (bottom of the callstack).
- child.selfTime = focusNode.selfTime;
- child.totalTime = focusNode.totalTime;
- child.numberOfCalls = focusNode.numberOfCalls;
- }
-
- this.appendChild(child);
- }
-
- var parent = ancestor.parent;
- if (parent && parent.parent) {
- nodeInfo.ancestor = parent;
- child._remainingNodeInfos.push(nodeInfo);
- }
- }
-
- delete this._remainingNodeInfos;
- },
-
- _willHaveChildren: function(profileNode)
- {
- profileNode = profileNode || this.profileNode;
- // In bottom up mode, our parents are our children since we display an inverted tree.
- // However, we don't want to show the very top parent since it is redundant.
- return !!(profileNode.parent && profileNode.parent.parent);
- }
-}
-
-WebInspector.LegacyBottomUpProfileDataGridNode.prototype.__proto__ = WebInspector.LegacyProfileDataGridNode.prototype;
-
-WebInspector.LegacyBottomUpProfileDataGridTree = function(profileNode)
-{
- WebInspector.LegacyProfileDataGridTree.call(this, profileNode);
-
- // Iterate each node in pre-order.
- var profileNodeUIDs = 0;
- var profileNodeGroups = [[], [profileNode]];
- var visitedProfileNodesForCallUID = {};
-
- this._remainingNodeInfos = [];
-
- for (var profileNodeGroupIndex = 0; profileNodeGroupIndex < profileNodeGroups.length; ++profileNodeGroupIndex) {
- var parentProfileNodes = profileNodeGroups[profileNodeGroupIndex];
- var profileNodes = profileNodeGroups[++profileNodeGroupIndex];
- var count = profileNodes.length;
-
- for (var index = 0; index < count; ++index) {
- var profileNode = profileNodes[index];
-
- if (!profileNode.UID)
- profileNode.UID = ++profileNodeUIDs;
-
- if (profileNode.head && profileNode !== profileNode.head) {
- // The total time of this ancestor is accounted for if we're in any form of recursive cycle.
- var visitedNodes = visitedProfileNodesForCallUID[profileNode.callUID];
- var totalTimeAccountedFor = false;
-
- if (!visitedNodes) {
- visitedNodes = {};
- visitedProfileNodesForCallUID[profileNode.callUID] = visitedNodes;
- } else {
- // The total time for this node has already been accounted for iff one of it's parents has already been visited.
- // We can do this check in this style because we are traversing the tree in pre-order.
- var parentCount = parentProfileNodes.length;
- for (var parentIndex = 0; parentIndex < parentCount; ++parentIndex) {
- if (visitedNodes[parentProfileNodes[parentIndex].UID]) {
- totalTimeAccountedFor = true;
- break;
- }
- }
- }
-
- visitedNodes[profileNode.UID] = true;
-
- this._remainingNodeInfos.push({ ancestor:profileNode, focusNode:profileNode, totalTimeAccountedFor:totalTimeAccountedFor });
- }
-
- var children = profileNode.children;
- if (children.length) {
- profileNodeGroups.push(parentProfileNodes.concat([profileNode]));
- profileNodeGroups.push(children);
- }
- }
- }
-
- // Populate the top level nodes.
- WebInspector.LegacyBottomUpProfileDataGridNode.prototype._populate.call(this);
-
- return this;
-}
-
-WebInspector.LegacyBottomUpProfileDataGridTree.prototype = {
- // When focusing, we keep the entire callstack up to this ancestor.
- focus: function(profileDataGridNode)
- {
- if (!profileDataGridNode)
- return;
-
- this._save();
-
- var currentNode = profileDataGridNode;
- var focusNode = profileDataGridNode;
-
- while (currentNode.parent && (currentNode instanceof WebInspector.LegacyProfileDataGridNode)) {
- currentNode._takePropertiesFromProfileDataGridNode(profileDataGridNode);
-
- focusNode = currentNode;
- currentNode = currentNode.parent;
-
- if (currentNode instanceof WebInspector.LegacyProfileDataGridNode)
- currentNode._keepOnlyChild(focusNode);
- }
-
- this.children = [focusNode];
- this.totalTime = profileDataGridNode.totalTime;
- },
-
- exclude: function(profileDataGridNode)
- {
- if (!profileDataGridNode)
- return;
-
- this._save();
-
- var excludedCallUID = profileDataGridNode.callUID;
- var excludedTopLevelChild = this.childrenByCallUID[excludedCallUID];
-
- // If we have a top level node that is excluded, get rid of it completely (not keeping children),
- // since bottom up data relies entirely on the root node.
- if (excludedTopLevelChild)
- this.children.remove(excludedTopLevelChild);
-
- var children = this.children;
- var count = children.length;
-
- for (var index = 0; index < count; ++index)
- children[index]._exclude(excludedCallUID);
-
- if (this.lastComparator)
- this.sort(this.lastComparator, true);
- },
-
- _sharedPopulate: WebInspector.LegacyBottomUpProfileDataGridNode.prototype._sharedPopulate
-}
-
-WebInspector.LegacyBottomUpProfileDataGridTree.prototype.__proto__ = WebInspector.LegacyProfileDataGridTree.prototype;
-
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileObjectjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileObject.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileObject.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileObject.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-WebInspector.LegacyJavaScriptProfileObject = function(title, id, recording)
-{
- WebInspector.LegacyProfileObject.call(this, WebInspector.LegacyJavaScriptProfileType.TypeId, title, id, recording);
-};
-
-WebInspector.LegacyJavaScriptProfileObject.prototype = {
- constructor: WebInspector.LegacyJavaScriptProfileObject
-};
-
-WebInspector.LegacyJavaScriptProfileObject.prototype.__proto__ = WebInspector.LegacyProfileObject.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileTypejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileType.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileType.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileType.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,95 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008, 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
- */
-
-WebInspector.LegacyJavaScriptProfileType = function()
-{
- WebInspector.LegacyProfileType.call(this, WebInspector.LegacyJavaScriptProfileType.TypeId, WebInspector.UIString("Collect JavaScript Profile"));
- this._recording = false;
- WebInspector.LegacyJavaScriptProfileType.instance = this;
-}
-
-WebInspector.LegacyJavaScriptProfileType.TypeId = "CPU";
-
-WebInspector.LegacyJavaScriptProfileType.prototype = {
- get buttonTooltip()
- {
- return this._recording ? WebInspector.UIString("Stop JavaScript profiling.") : WebInspector.UIString("Start JavaScript profiling.");
- },
-
- buttonClicked: function()
- {
- if (this._recording) {
- this.stopRecordingProfile();
- WebInspector.networkManager.enableResourceTracking();
- } else {
- WebInspector.networkManager.disableResourceTracking();
- this.startRecordingProfile();
- }
- },
-
- get treeItemTitle()
- {
- return WebInspector.UIString("JAVASCRIPT PROFILES");
- },
-
- get description()
- {
- return WebInspector.UIString("JavaScript profiles show where the execution time is spent in your page's JavaScript functions.");
- },
-
- isRecordingProfile: function()
- {
- return this._recording;
- },
-
- startRecordingProfile: function()
- {
- this._recording = true;
- ProfilerAgent.start();
- },
-
- stopRecordingProfile: function()
- {
- this._recording = false;
- ProfilerAgent.stop();
- },
-
- setRecordingProfile: function(isProfiling)
- {
- this._recording = isProfiling;
- },
-
- createSidebarTreeElementForProfile: function(profile)
- {
- return new WebInspector.LegacyProfileSidebarTreeElement(profile, WebInspector.UIString("Profile %d"), "profile-sidebar-tree-item");
- },
-
- createView: function(profile)
- {
- return new WebInspector.LegacyJavaScriptProfileView(profile);
- }
-}
-
-WebInspector.LegacyJavaScriptProfileType.prototype.__proto__ = WebInspector.LegacyProfileType.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileViewcss"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.css (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.css 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.css 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,74 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-.content-view.profile-view > .data-grid {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
-}
-
-.profile-view .data-grid th.average-column {
- text-align: center;
-}
-
-.profile-view .data-grid td.average-column {
- text-align: right;
-}
-
-.profile-view .data-grid th.self-column {
- text-align: center;
-}
-
-.profile-view .data-grid td.self-column {
- text-align: right;
-}
-
-.profile-view .data-grid th.total-column {
- text-align: center;
-}
-
-.profile-view .data-grid td.total-column {
- text-align: right;
-}
-
-.profile-view .data-grid .calls-column {
- text-align: center;
-}
-
-.profile-node-file {
- float: right;
- color: gray;
- margin-top: -1px;
-}
-
-.data-grid tr.selected .profile-node-file {
- color: rgb(33%, 33%, 33%);
-}
-
-.data-grid:focus tr.selected .profile-node-file {
- color: white;
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyJavaScriptProfileViewjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyJavaScriptProfileView.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,458 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008, 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
- */
-
-WebInspector.LegacyJavaScriptProfileView = function(profile)
-{
- console.assert(profile instanceof WebInspector.LegacyJavaScriptProfileObject);
-
- WebInspector.LegacyProfileView.call(this, profile, "javascript-profiler-show-time-as-percent");
-
- this._showTreeBottomUpSetting = new WebInspector.Setting("javascript-profiler-show-tree-bottom-up", true);
-
- this._showTreeBottomUpNavigationItem = new WebInspector.ActivateButtonNavigationItem("show-tree-bottom-up-navigation-item", WebInspector.UIString("Invert call tree"), WebInspector.UIString("Normal call tree"), "Images/BottomUpTree.svg", 16, 16);
- this._showTreeBottomUpNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._toggleBottomUpView, this);
- this._showTreeBottomUpNavigationItem.activated = this._showTreeBottomUpSetting.value;
-
- this._viewType = new WebInspector.Setting("javascript-profiler-view", WebInspector.LegacyJavaScriptProfileView._TypeHeavy);
-}
-
-WebInspector.LegacyJavaScriptProfileView._TypeTree = "Tree";
-WebInspector.LegacyJavaScriptProfileView._TypeHeavy = "Heavy";
-
-WebInspector.LegacyJavaScriptProfileView.prototype = {
- constructor: WebInspector.LegacyJavaScriptProfileView,
-
- updateLayout: function()
- {
- if (this.dataGrid)
- this.dataGrid.updateLayout();
- },
-
- get recordingTitle()
- {
- return WebInspector.UIString("Recording JavaScript Profile\u2026");
- },
-
- displayProfile: function()
- {
- var columns = { "self": { title: WebInspector.UIString("Self"), width: "72px", sort: "descending", sortable: true },
- "total": { title: WebInspector.UIString("Total"), width: "72px", sortable: true },
- "average": { title: WebInspector.UIString("Average"), width: "72px", sortable: true },
- "calls": { title: WebInspector.UIString("Calls"), width: "54px", sortable: true },
- "function": { title: WebInspector.UIString("Function"), disclosure: true, sortable: true } };
-
- this.dataGrid = new WebInspector.DataGrid(columns);
- this.dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortData, this);
-
- this.element.appendChild(this.dataGrid.element);
- this.dataGrid.updateLayout();
-
- function profileCallback(error, profile)
- {
- if (error)
- return;
-
- if (!profile.head) {
- // Profiling was tentatively terminated with the "Clear all profiles." button.
- return;
- }
- this.profile.head = profile.head;
- this._assignParentsInProfile();
- this._changeView();
- }
-
- // COMPATIBILITY (iOS 6): getCPUProfile use to be called getProfile.
- if (ProfilerAgent.getProfile)
- ProfilerAgent.getProfile(this.profile.type, this.profile.id, profileCallback.bind(this));
- else
- ProfilerAgent.getCPUProfile(this.profile.id, profileCallback.bind(this));
- },
-
- get navigationItems()
- {
- return [this._showTreeBottomUpNavigationItem, this.showTimeAsPercentNavigationItem];
- },
-
- get bottomUpProfileDataGridTree()
- {
- if (!this._bottomUpProfileDataGridTree)
- this._bottomUpProfileDataGridTree = new WebInspector.LegacyBottomUpProfileDataGridTree(this.profile.head);
- return this._bottomUpProfileDataGridTree;
- },
-
- get topDownProfileDataGridTree()
- {
- if (!this._topDownProfileDataGridTree)
- this._topDownProfileDataGridTree = new WebInspector.LegacyTopDownProfileDataGridTree(this.profile.head);
- return this._topDownProfileDataGridTree;
- },
-
- willHide: function()
- {
- this._currentSearchResultIndex = -1;
- },
-
- refresh: function()
- {
- var selectedProfileNode = this.dataGrid.selectedNode ? this.dataGrid.selectedNode.profileNode : null;
-
- this.dataGrid.removeChildren();
-
- var children = this.profileDataGridTree.children;
- var count = children.length;
-
- for (var index = 0; index < count; ++index)
- this.dataGrid.appendChild(children[index]);
-
- if (selectedProfileNode)
- selectedProfileNode.selected = true;
- },
-
- refreshVisibleData: function()
- {
- var child = this.dataGrid.children[0];
- while (child) {
- child.refresh(this.showTimeAsPercent.value);
- child = child.traverseNextNode(false, null, true);
- }
- },
-
- searchCanceled: function()
- {
- if (this._searchResults) {
- for (var i = 0; i < this._searchResults.length; ++i) {
- var profileNode = this._searchResults[i].profileNode;
-
- delete profileNode._searchMatchedSelfColumn;
- delete profileNode._searchMatchedTotalColumn;
- delete profileNode._searchMatchedCallsColumn;
- delete profileNode._searchMatchedFunctionColumn;
-
- profileNode.refresh();
- }
- }
-
- delete this._searchFinishedCallback;
- this._currentSearchResultIndex = -1;
- this._searchResults = [];
- },
-
- performSearch: function(query, finishedCallback)
- {
- // Call searchCanceled since it will reset everything we need before doing a new search.
- this.searchCanceled();
-
- query = query.trim();
-
- if (!query.length)
- return;
-
- this._searchFinishedCallback = finishedCallback;
-
- var greaterThan = query.charAt(0) === ">";
- var lessThan = query.charAt(0) === "<";
- var equalTo = (query.charAt(0) === "=" || ((greaterThan || lessThan) && query.charAt(1) === "="));
- var percentUnits = (query.lastIndexOf("%") === (query.length - 1));
- var millisecondsUnits = (query.length > 2 && query.lastIndexOf("ms") === (query.length - 2));
- var secondsUnits = (!millisecondsUnits && query.lastIndexOf("s") === (query.length - 1));
-
- var queryNumber = parseFloat(query);
- if (greaterThan || lessThan || equalTo) {
- if (equalTo && (greaterThan || lessThan))
- queryNumber = parseFloat(query.substring(2));
- else
- queryNumber = parseFloat(query.substring(1));
- }
-
- var queryNumberMilliseconds = (secondsUnits ? (queryNumber * 1000) : queryNumber);
-
- // Make equalTo implicitly true if it wasn't specified there is no other operator.
- if (!isNaN(queryNumber) && !(greaterThan || lessThan))
- equalTo = true;
-
- function matchesQuery(/*ProfileDataGridNode*/ profileDataGridNode)
- {
- delete profileDataGridNode._searchMatchedSelfColumn;
- delete profileDataGridNode._searchMatchedTotalColumn;
- delete profileDataGridNode._searchMatchedAverageColumn;
- delete profileDataGridNode._searchMatchedCallsColumn;
- delete profileDataGridNode._searchMatchedFunctionColumn;
-
- if (percentUnits) {
- if (lessThan) {
- if (profileDataGridNode.selfPercent < queryNumber)
- profileDataGridNode._searchMatchedSelfColumn = true;
- if (profileDataGridNode.totalPercent < queryNumber)
- profileDataGridNode._searchMatchedTotalColumn = true;
- if (profileDataGridNode.averagePercent < queryNumberMilliseconds)
- profileDataGridNode._searchMatchedAverageColumn = true;
- } else if (greaterThan) {
- if (profileDataGridNode.selfPercent > queryNumber)
- profileDataGridNode._searchMatchedSelfColumn = true;
- if (profileDataGridNode.totalPercent > queryNumber)
- profileDataGridNode._searchMatchedTotalColumn = true;
- if (profileDataGridNode.averagePercent < queryNumberMilliseconds)
- profileDataGridNode._searchMatchedAverageColumn = true;
- }
-
- if (equalTo) {
- if (profileDataGridNode.selfPercent == queryNumber)
- profileDataGridNode._searchMatchedSelfColumn = true;
- if (profileDataGridNode.totalPercent == queryNumber)
- profileDataGridNode._searchMatchedTotalColumn = true;
- if (profileDataGridNode.averagePercent < queryNumberMilliseconds)
- profileDataGridNode._searchMatchedAverageColumn = true;
- }
- } else if (millisecondsUnits || secondsUnits) {
- if (lessThan) {
- if (profileDataGridNode.selfTime < queryNumberMilliseconds)
- profileDataGridNode._searchMatchedSelfColumn = true;
- if (profileDataGridNode.totalTime < queryNumberMilliseconds)
- profileDataGridNode._searchMatchedTotalColumn = true;
- if (profileDataGridNode.averageTime < queryNumberMilliseconds)
- profileDataGridNode._searchMatchedAverageColumn = true;
- } else if (greaterThan) {
- if (profileDataGridNode.selfTime > queryNumberMilliseconds)
- profileDataGridNode._searchMatchedSelfColumn = true;
- if (profileDataGridNode.totalTime > queryNumberMilliseconds)
- profileDataGridNode._searchMatchedTotalColumn = true;
- if (profileDataGridNode.averageTime > queryNumberMilliseconds)
- profileDataGridNode._searchMatchedAverageColumn = true;
- }
-
- if (equalTo) {
- if (profileDataGridNode.selfTime == queryNumberMilliseconds)
- profileDataGridNode._searchMatchedSelfColumn = true;
- if (profileDataGridNode.totalTime == queryNumberMilliseconds)
- profileDataGridNode._searchMatchedTotalColumn = true;
- if (profileDataGridNode.averageTime == queryNumberMilliseconds)
- profileDataGridNode._searchMatchedAverageColumn = true;
- }
- } else {
- if (equalTo && profileDataGridNode.numberOfCalls == queryNumber)
- profileDataGridNode._searchMatchedCallsColumn = true;
- if (greaterThan && profileDataGridNode.numberOfCalls > queryNumber)
- profileDataGridNode._searchMatchedCallsColumn = true;
- if (lessThan && profileDataGridNode.numberOfCalls < queryNumber)
- profileDataGridNode._searchMatchedCallsColumn = true;
- }
-
- if (profileDataGridNode.functionName.hasSubstring(query, true) || profileDataGridNode.url.hasSubstring(query, true))
- profileDataGridNode._searchMatchedFunctionColumn = true;
-
- if (profileDataGridNode._searchMatchedSelfColumn ||
- profileDataGridNode._searchMatchedTotalColumn ||
- profileDataGridNode._searchMatchedAverageColumn ||
- profileDataGridNode._searchMatchedCallsColumn ||
- profileDataGridNode._searchMatchedFunctionColumn)
- {
- profileDataGridNode.refresh();
- return true;
- }
-
- return false;
- }
-
- var current = this.profileDataGridTree.children[0];
-
- while (current) {
- if (matchesQuery(current)) {
- this._searchResults.push({ profileNode: current });
- }
-
- current = current.traverseNextNode(false, null, false);
- }
-
- finishedCallback(this, this._searchResults.length);
- },
-
- jumpToFirstSearchResult: function()
- {
- if (!this._searchResults || !this._searchResults.length)
- return;
- this._currentSearchResultIndex = 0;
- this._jumpToSearchResult(this._currentSearchResultIndex);
- },
-
- jumpToLastSearchResult: function()
- {
- if (!this._searchResults || !this._searchResults.length)
- return;
- this._currentSearchResultIndex = (this._searchResults.length - 1);
- this._jumpToSearchResult(this._currentSearchResultIndex);
- },
-
- jumpToNextSearchResult: function()
- {
- if (!this._searchResults || !this._searchResults.length)
- return;
- if (++this._currentSearchResultIndex >= this._searchResults.length)
- this._currentSearchResultIndex = 0;
- this._jumpToSearchResult(this._currentSearchResultIndex);
- },
-
- jumpToPreviousSearchResult: function()
- {
- if (!this._searchResults || !this._searchResults.length)
- return;
- if (--this._currentSearchResultIndex < 0)
- this._currentSearchResultIndex = (this._searchResults.length - 1);
- this._jumpToSearchResult(this._currentSearchResultIndex);
- },
-
- showingFirstSearchResult: function()
- {
- return (this._currentSearchResultIndex === 0);
- },
-
- showingLastSearchResult: function()
- {
- return (this._searchResults && this._currentSearchResultIndex === (this._searchResults.length - 1));
- },
-
- _jumpToSearchResult: function(index)
- {
- var searchResult = this._searchResults[index];
- if (!searchResult)
- return;
-
- var profileNode = searchResult.profileNode;
- profileNode.revealAndSelect();
- },
-
- _toggleBottomUpView: function(event)
- {
- this._showTreeBottomUpSetting.value = !this._showTreeBottomUpSetting.value;
- this._showTreeBottomUpNavigationItem.activated = this._showTreeBottomUpSetting.value;
- this._changeView();
- },
-
- _changeView: function()
- {
- if (!this.profile)
- return;
-
- if (!this._showTreeBottomUpSetting.value) {
- this.profileDataGridTree = this.topDownProfileDataGridTree;
- this._sortProfile();
- this._viewType.value = WebInspector.LegacyJavaScriptProfileView._TypeTree;
- } else {
- this.profileDataGridTree = this.bottomUpProfileDataGridTree;
- this._sortProfile();
- this._viewType.value = WebInspector.LegacyJavaScriptProfileView._TypeHeavy;
- }
-
- if (!this.currentQuery || !this._searchFinishedCallback || !this._searchResults)
- return;
-
- // The current search needs to be performed again. First negate out previous match
- // count by calling the search finished callback with a negative number of matches.
- // Then perform the search again the with same query and callback.
- this._searchFinishedCallback(this, -this._searchResults.length);
- this.performSearch(this.currentQuery, this._searchFinishedCallback);
- },
-
- toggleTimeDisplay: function(event)
- {
- WebInspector.LegacyProfileView.prototype.toggleTimeDisplay.call(this, event);
- this.showTimeAsPercent.value = !this.showTimeAsPercent.value;
- this.refreshVisibleData();
- },
-
- _focusClicked: function(event)
- {
- if (!this.dataGrid.selectedNode)
- return;
-
- this.profileDataGridTree.focus(this.dataGrid.selectedNode);
- this.refresh();
- this.refreshVisibleData();
- },
-
- _excludeClicked: function(event)
- {
- var selectedNode = this.dataGrid.selectedNode;
-
- if (!selectedNode)
- return;
-
- selectedNode.deselect();
-
- this.profileDataGridTree.exclude(selectedNode);
- this.refresh();
- this.refreshVisibleData();
- },
-
- _resetClicked: function(event)
- {
- this.profileDataGridTree.restore();
- this.refresh();
- this.refreshVisibleData();
- },
-
- _sortData: function(event)
- {
- this._sortProfile(this.profile);
- },
-
- _sortProfile: function()
- {
- var sortAscending = this.dataGrid.sortOrder === WebInspector.DataGrid.SortOrder.Ascending;
- var sortColumnIdentifier = this.dataGrid.sortColumnIdentifier;
- var sortProperty = {
- "average": "averageTime",
- "self": "selfTime",
- "total": "totalTime",
- "calls": "numberOfCalls",
- "function": "functionName"
- }[sortColumnIdentifier];
-
- this.profileDataGridTree.sort(WebInspector.LegacyProfileDataGridTree.propertyComparator(sortProperty, sortAscending));
-
- this.refresh();
- },
-
- _assignParentsInProfile: function()
- {
- var head = this.profile.head;
- head.parent = null;
- head.head = null;
- var nodesToTraverse = [ { parent: head, children: head.children } ];
- while (nodesToTraverse.length > 0) {
- var pair = nodesToTraverse.shift();
- var parent = pair.parent;
- var children = pair.children;
- var length = children.length;
- for (var i = 0; i < length; ++i) {
- children[i].head = head;
- children[i].parent = parent;
- if (children[i].children.length > 0)
- nodesToTraverse.push({ parent: children[i], children: children[i].children });
- }
- }
- }
-}
-
-WebInspector.LegacyJavaScriptProfileView.prototype.__proto__ = WebInspector.LegacyProfileView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileDataGridTreejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileDataGridTree.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileDataGridTree.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileDataGridTree.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,399 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 280 North 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
- */
-
-WebInspector.LegacyProfileDataGridNode = function(profileNode, owningTree, hasChildren, showTimeAsPercent)
-{
- this.profileNode = profileNode;
-
- WebInspector.DataGridNode.call(this, null, hasChildren);
-
- this.addEventListener("populate", this._populate, this);
-
- this.tree = owningTree;
-
- this.childrenByCallUID = {};
- this.lastComparator = null;
-
- this.callUID = profileNode.callUID;
- this.selfTime = profileNode.selfTime;
- this.totalTime = profileNode.totalTime;
- this.functionName = profileNode.functionName;
- this.numberOfCalls = profileNode.numberOfCalls;
- this.url = profileNode.url;
-
- this._showTimeAsPercent = showTimeAsPercent || false;
-}
-
-WebInspector.LegacyProfileDataGridNode.prototype = {
- get data()
- {
- function formatMilliseconds(time)
- {
- return Number.secondsToString(time / 1000, true);
- }
-
- var data = {};
-
- data["function"] = this.functionName;
- data["calls"] = this.numberOfCalls;
-
- if (this._showTimeAsPercent) {
- data["self"] = WebInspector.UIString("%.2f %%").format(this.selfPercent);
- data["total"] = WebInspector.UIString("%.2f %%").format(this.totalPercent);
- data["average"] = WebInspector.UIString("%.2f %%").format(this.averagePercent);
- } else {
- data["self"] = formatMilliseconds(this.selfTime);
- data["total"] = formatMilliseconds(this.totalTime);
- data["average"] = formatMilliseconds(this.averageTime);
- }
-
- return data;
- },
-
- get showTimeAsPercent()
- {
- return this._showTimeAsPercent;
- },
-
- refresh: function(showTimeAsPercent)
- {
- this._showTimeAsPercent = showTimeAsPercent;
-
- WebInspector.DataGridNode.prototype.refresh.call(this);
- },
-
- createCell: function(columnIdentifier)
- {
- var cell = WebInspector.DataGridNode.prototype.createCell.call(this, columnIdentifier);
-
- if (columnIdentifier === "self" && this._searchMatchedSelfColumn)
- cell.classList.add("highlight");
- else if (columnIdentifier === "total" && this._searchMatchedTotalColumn)
- cell.classList.add("highlight");
- else if (columnIdentifier === "average" && this._searchMatchedAverageColumn)
- cell.classList.add("highlight");
- else if (columnIdentifier === "calls" && this._searchMatchedCallsColumn)
- cell.classList.add("highlight");
-
- if (columnIdentifier !== "function")
- return cell;
-
- if (this.profileNode._searchMatchedFunctionColumn)
- cell.classList.add("highlight");
-
- if (this.profileNode.url) {
- // FIXME(62725): profileNode should reference a debugger location.
- var lineNumber = this.profileNode.lineNumber ? this.profileNode.lineNumber - 1 : 0;
- var urlElement = this._linkifyLocation(this.profileNode.url, lineNumber, "profile-node-file");
- urlElement.style.maxWidth = "75%";
- cell.insertBefore(urlElement, cell.firstChild);
- }
-
- return cell;
- },
-
- sort: function(comparator, force)
- {
- var gridNodeGroups = [[this]];
-
- for (var gridNodeGroupIndex = 0; gridNodeGroupIndex < gridNodeGroups.length; ++gridNodeGroupIndex) {
- var gridNodes = gridNodeGroups[gridNodeGroupIndex];
- var count = gridNodes.length;
-
- for (var index = 0; index < count; ++index) {
- var gridNode = gridNodes[index];
-
- // If the grid node is collapsed, then don't sort children (save operation for later).
- // If the grid node has the same sorting as previously, then there is no point in sorting it again.
- if (!force && (!gridNode.expanded || gridNode.lastComparator === comparator)) {
- if (gridNode.children.length)
- gridNode.shouldRefreshChildren = true;
- continue;
- }
-
- gridNode.lastComparator = comparator;
-
- var children = gridNode.children;
- var childCount = children.length;
-
- if (childCount) {
- children.sort(comparator);
-
- for (var childIndex = 0; childIndex < childCount; ++childIndex)
- children[childIndex]._recalculateSiblings(childIndex);
-
- gridNodeGroups.push(children);
- }
- }
- }
- },
-
- insertChild: function(profileDataGridNode, index)
- {
- WebInspector.DataGridNode.prototype.insertChild.call(this, profileDataGridNode, index);
-
- this.childrenByCallUID[profileDataGridNode.callUID] = profileDataGridNode;
- },
-
- removeChild: function(profileDataGridNode)
- {
- WebInspector.DataGridNode.prototype.removeChild.call(this, profileDataGridNode);
-
- delete this.childrenByCallUID[profileDataGridNode.callUID];
- },
-
- removeChildren: function(profileDataGridNode)
- {
- WebInspector.DataGridNode.prototype.removeChildren.call(this);
-
- this.childrenByCallUID = {};
- },
-
- findChild: function(node)
- {
- if (!node)
- return null;
- return this.childrenByCallUID[node.callUID];
- },
-
- get averageTime()
- {
- return this.selfTime / Math.max(1, this.numberOfCalls);
- },
-
- get averagePercent()
- {
- return this.averageTime / this.tree.totalTime * 100.0;
- },
-
- get selfPercent()
- {
- return this.selfTime / this.tree.totalTime * 100.0;
- },
-
- get totalPercent()
- {
- return this.totalTime / this.tree.totalTime * 100.0;
- },
-
- get _parent()
- {
- return this.parent !== this.dataGrid ? this.parent : this.tree;
- },
-
- _populate: function(event)
- {
- this._sharedPopulate();
-
- if (this._parent) {
- var currentComparator = this._parent.lastComparator;
-
- if (currentComparator)
- this.sort(currentComparator, true);
- }
-
- if (this.removeEventListener)
- this.removeEventListener("populate", this._populate, this);
- },
-
- // When focusing and collapsing we modify lots of nodes in the tree.
- // This allows us to restore them all to their original state when we revert.
- _save: function()
- {
- if (this._savedChildren)
- return;
-
- this._savedSelfTime = this.selfTime;
- this._savedTotalTime = this.totalTime;
- this._savedNumberOfCalls = this.numberOfCalls;
-
- this._savedChildren = this.children.slice();
- },
-
- // When focusing and collapsing we modify lots of nodes in the tree.
- // This allows us to restore them all to their original state when we revert.
- _restore: function()
- {
- if (!this._savedChildren)
- return;
-
- this.selfTime = this._savedSelfTime;
- this.totalTime = this._savedTotalTime;
- this.numberOfCalls = this._savedNumberOfCalls;
-
- this.removeChildren();
-
- var children = this._savedChildren;
- var count = children.length;
-
- for (var index = 0; index < count; ++index) {
- children[index]._restore();
- this.appendChild(children[index]);
- }
- },
-
- _merge: function(child, shouldAbsorb)
- {
- this.selfTime += child.selfTime;
-
- if (!shouldAbsorb) {
- this.totalTime += child.totalTime;
- this.numberOfCalls += child.numberOfCalls;
- }
-
- var children = this.children.slice();
-
- this.removeChildren();
-
- var count = children.length;
-
- for (var index = 0; index < count; ++index) {
- if (!shouldAbsorb || children[index] !== child)
- this.appendChild(children[index]);
- }
-
- children = child.children.slice();
- count = children.length;
-
- for (var index = 0; index < count; ++index) {
- var orphanedChild = children[index],
- existingChild = this.childrenByCallUID[orphanedChild.callUID];
-
- if (existingChild)
- existingChild._merge(orphanedChild, false);
- else
- this.appendChild(orphanedChild);
- }
- },
-
- _linkifyLocation: function(url, lineNumber, className)
- {
- // FIXME: CPUProfileNode's need columnNumbers.
- return WebInspector.linkifyLocation(url, lineNumber, 0, className);
- }
-}
-
-WebInspector.LegacyProfileDataGridNode.prototype.__proto__ = WebInspector.DataGridNode.prototype;
-
-WebInspector.LegacyProfileDataGridTree = function(profileNode)
-{
- this.tree = this;
- this.children = [];
-
- this.totalTime = profileNode.totalTime;
- this.lastComparator = null;
-
- this.childrenByCallUID = {};
-}
-
-WebInspector.LegacyProfileDataGridTree.prototype = {
- get expanded()
- {
- return true;
- },
-
- appendChild: function(child)
- {
- this.insertChild(child, this.children.length);
- },
-
- insertChild: function(child, index)
- {
- this.children.splice(index, 0, child);
- this.childrenByCallUID[child.callUID] = child;
- },
-
- removeChildren: function()
- {
- this.children = [];
- this.childrenByCallUID = {};
- },
-
- findChild: WebInspector.LegacyProfileDataGridNode.prototype.findChild,
- sort: WebInspector.LegacyProfileDataGridNode.prototype.sort,
-
- _save: function()
- {
- if (this._savedChildren)
- return;
-
- this._savedTotalTime = this.totalTime;
- this._savedChildren = this.children.slice();
- },
-
- restore: function()
- {
- if (!this._savedChildren)
- return;
-
- this.children = this._savedChildren;
- this.totalTime = this._savedTotalTime;
-
- var children = this.children;
- var count = children.length;
-
- for (var index = 0; index < count; ++index)
- children[index]._restore();
-
- this._savedChildren = null;
- }
-}
-
-WebInspector.LegacyProfileDataGridTree.propertyComparators = [{}, {}];
-
-WebInspector.LegacyProfileDataGridTree.propertyComparator = function(property, isAscending)
-{
- var comparator = this.propertyComparators[(isAscending ? 1 : 0)][property];
-
- if (!comparator) {
- if (isAscending) {
- comparator = function(lhs, rhs)
- {
- if (lhs[property] < rhs[property])
- return -1;
-
- if (lhs[property] > rhs[property])
- return 1;
-
- return 0;
- };
- } else {
- comparator = function(lhs, rhs)
- {
- if (lhs[property] > rhs[property])
- return -1;
-
- if (lhs[property] < rhs[property])
- return 1;
-
- return 0;
- };
- }
-
- this.propertyComparators[(isAscending ? 1 : 0)][property] = comparator;
- }
-
- return comparator;
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileObjectjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileObject.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileObject.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileObject.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-WebInspector.LegacyProfileObject = function(type, title, id, isRecording)
-{
- WebInspector.Object.call(this);
-
- console.assert(type);
- console.assert(title);
- console.assert(id);
-
- this._type = type;
- this._title = title;
- this._id = id;
- this._isRecording = isRecording || false;
-};
-
-WebInspector.LegacyProfileObject.Event = {
- FinshedRecording: "profile-object-finished-recording"
-};
-
-WebInspector.LegacyProfileObject.prototype = {
- constructor: WebInspector.LegacyProfileObject,
-
- get type()
- {
- return this._type;
- },
-
- set type(type)
- {
- this._type = type;
- },
-
- get title()
- {
- return this._title;
- },
-
- set title(title)
- {
- this._title = title;
- },
-
- get id()
- {
- return this._id;
- },
-
- set id(id)
- {
- this._id = id;
- },
-
- get recording()
- {
- return this._isRecording;
- },
-
- set recording(flag)
- {
- if (this._isRecording === flag)
- return;
-
- this._isRecording = flag;
- if (!flag)
- this.dispatchEventToListeners(WebInspector.LegacyProfileObject.Event.FinshedRecording);
- }
-};
-
-WebInspector.LegacyProfileObject.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileTypejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileType.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileType.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileType.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008, 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
- */
-
-WebInspector.LegacyProfileType = function(id, name)
-{
- this._id = id;
- this._name = name;
-}
-
-WebInspector.LegacyProfileType.URLRegExp = /webkit-profile:\/\/(.+)\/(.+)#([0-9]+)/;
-WebInspector.LegacyProfileType.ProfileScheme = "webkit-profile";
-
-WebInspector.LegacyProfileType.prototype = {
- get buttonTooltip()
- {
- return "";
- },
-
- get id()
- {
- return this._id;
- },
-
- get treeItemTitle()
- {
- return this._name;
- },
-
- get name()
- {
- return this._name;
- },
-
- buttonClicked: function()
- {
- },
-
- viewForProfile: function(profile)
- {
- if (!profile._profileView)
- profile._profileView = this.createView(profile);
- return profile._profileView;
- },
-
- reset: function()
- {
- },
-
- get description()
- {
- return "";
- },
-
- // Must be implemented by subclasses.
- createView: function(profile)
- {
- throw new Error("Needs implemented.");
- },
-
- // Must be implemented by subclasses.
- createSidebarTreeElementForProfile: function(profile)
- {
- throw new Error("Needs implemented.");
- }
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileViewcss"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.css (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.css 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.css 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-.recording-profile-view {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
-
- display: -webkit-flex;
- -webkit-flex-flow: row nowrap;
- -webkit-justify-content: center;
- -webkit-align-content: center;
- -webkit-align-items: center;
-
- background-color: rgb(232, 232, 232);
-}
-
-.recording-profile-view > .indeterminate-progress-spinner {
- position: static;
- margin: 0;
-}
-
-.recording-profile-view > span {
- font-size: 14px;
-
- text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;
- color: rgb(60, 60, 60);
-
- padding-left: 10px;
-
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyProfileViewjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyProfileView.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,109 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013 Apple 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS 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 APPLE INC. OR ITS 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.
- */
-
-WebInspector.LegacyProfileView = function(profile, settingId)
-{
- WebInspector.ContentView.call(this, profile);
-
- this._profile = profile;
-
- this.element.classList.add("profile-view");
-
- this.showTimeAsPercent = new WebInspector.Setting(settingId, true);
- this.showTimeAsPercentNavigationItem = new WebInspector.ActivateButtonNavigationItem("selector-profiler-show-time-as-percent-navigation-item", WebInspector.UIString("Show times as percentages"), WebInspector.UIString("Show times as absolute times"), "Images/Percent.svg", 16, 16);
- this.showTimeAsPercentNavigationItem.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this.toggleTimeDisplay, this);
- this.showTimeAsPercentNavigationItem.activated = this.showTimeAsPercent.value;
-
- if (profile.recording) {
- this._showRecordingMessage();
- profile.addEventListener(WebInspector.LegacyProfileObject.Event.FinshedRecording, this._profileFinishedRecording, this);
- } else
- this.displayProfile();
-};
-
-WebInspector.LegacyProfileView.prototype = {
- constructor: WebInspector.LegacyProfileView,
-
- // Public
-
- get navigationItems()
- {
- return [this.showTimeAsPercentNavigationItem];
- },
-
- get allowedNavigationSidebarPanels()
- {
- return ["instrument"];
- },
-
- get profile()
- {
- return this._profile;
- },
-
- set profile(profile)
- {
- this._profile = profile;
- },
-
- toggleTimeDisplay: function(event)
- {
- this.showTimeAsPercentNavigationItem.activated = !this.showTimeAsPercentNavigationItem.activated;
- },
-
- displayProfile: function()
- {
- // Implemented by subclasses.
- },
-
- get recordingTitle()
- {
- return WebInspector.UIString("Recording\u2026");
- },
-
- // Private
-
- _profileFinishedRecording: function()
- {
- this._hideRecordingMessage();
- this.displayProfile();
- },
-
- _showRecordingMessage: function()
- {
- this._recordingMessageContainer = this.element.appendChild(document.createElement("div"));
- this._recordingMessageContainer.className = "recording-profile-view";
- this._recordingMessageContainer.appendChild(new WebInspector.IndeterminateProgressSpinner().element);
- this._recordingMessageContainer.appendChild(document.createElement("span")).textContent = this.recordingTitle;
- },
-
- _hideRecordingMessage: function()
- {
- if (this._recordingMessageContainer)
- this._recordingMessageContainer.remove();
- }
-};
-
-WebInspector.LegacyProfileView.prototype.__proto__ = WebInspector.ContentView.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLegacyTopDownProfileDataGridTreejs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/LegacyTopDownProfileDataGridTree.js (173197 => 173198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LegacyTopDownProfileDataGridTree.js 2014-09-03 01:28:33 UTC (rev 173197)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LegacyTopDownProfileDataGridTree.js 2014-09-03 03:17:47 UTC (rev 173198)
</span><span class="lines">@@ -1,121 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 280 North 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 APPLE INC. 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.
- */
-
-WebInspector.LegacyTopDownProfileDataGridNode = function(profileNode, owningTree)
-{
- var hasChildren = (profileNode.children && profileNode.children.length);
-
- WebInspector.LegacyProfileDataGridNode.call(this, profileNode, owningTree, hasChildren);
-
- this._remainingChildren = profileNode.children;
-}
-
-WebInspector.LegacyTopDownProfileDataGridNode.prototype = {
- _sharedPopulate: function()
- {
- var children = this._remainingChildren;
- var childrenLength = children.length;
-
- for (var i = 0; i < childrenLength; ++i)
- this.appendChild(new WebInspector.LegacyTopDownProfileDataGridNode(children[i], this.tree, false, this.showTimeAsPercent));
-
- this._remainingChildren = null;
- },
-
- _exclude: function(aCallUID)
- {
- if (this._remainingChildren)
- this._populate();
-
- this._save();
-
- var children = this.children;
- var index = this.children.length;
-
- while (index--)
- children[index]._exclude(aCallUID);
-
- var child = this.childrenByCallUID[aCallUID];
-
- if (child)
- this._merge(child, true);
- }
-}
-
-WebInspector.LegacyTopDownProfileDataGridNode.prototype.__proto__ = WebInspector.LegacyProfileDataGridNode.prototype;
-
-WebInspector.LegacyTopDownProfileDataGridTree = function(profileNode)
-{
- WebInspector.LegacyProfileDataGridTree.call(this, profileNode);
-
- this._remainingChildren = profileNode.children;
-
- WebInspector.LegacyTopDownProfileDataGridNode.prototype._populate.call(this);
-}
-
-WebInspector.LegacyTopDownProfileDataGridTree.prototype = {
- focus: function(profileDataGrideNode)
- {
- if (!profileDataGrideNode)
- return;
-
- this._save();
- profileDataGrideNode.savePosition();
-
- this.children = [profileDataGrideNode];
- this.totalTime = profileDataGrideNode.totalTime;
- },
-
- exclude: function(profileDataGrideNode)
- {
- if (!profileDataGrideNode)
- return;
-
- this._save();
-
- var excludedCallUID = profileDataGrideNode.callUID;
-
- WebInspector.LegacyTopDownProfileDataGridNode.prototype._exclude.call(this, excludedCallUID);
-
- if (this.lastComparator)
- this.sort(this.lastComparator, true);
- },
-
- restore: function()
- {
- if (!this._savedChildren)
- return;
-
- this.children[0].restorePosition();
-
- WebInspector.LegacyProfileDataGridTree.prototype.restore.call(this);
- },
-
- _merge: WebInspector.LegacyTopDownProfileDataGridNode.prototype._merge,
-
- _sharedPopulate: WebInspector.LegacyTopDownProfileDataGridNode.prototype._sharedPopulate
-}
-
-WebInspector.LegacyTopDownProfileDataGridTree.prototype.__proto__ = WebInspector.LegacyProfileDataGridTree.prototype;
</del></span></pre>
</div>
</div>
</body>
</html>