<!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>[166846] 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/166846">166846</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-04-05 17:51:14 -0700 (Sat, 05 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: remove unused metrics and commands from the Timeline agent
https://bugs.webkit.org/show_bug.cgi?id=131184
Reviewed by Timothy Hatcher.
Source/WebCore:
This patch removes several instrumentation hooks that are not being
used by the frontend in any way. Most of them are not hooked up to
produce any data, so they just clutter up InspectorClient and the agent.
* WebCore.exp.in: Remove didBeginFrame/didCancelFrame.
* inspector/InspectorClient.h: Remove client methods that are never overridden.
(WebCore::InspectorClient::canMonitorMainThread): Deleted.
(WebCore::InspectorClient::supportsFrameInstrumentation): Deleted.
(WebCore::InspectorClient::getAllocatedObjects): Deleted.
(WebCore::InspectorClient::dumpUncountedAllocatedObjects): Deleted.
* inspector/InspectorController.cpp: Remove unused instrumentation.
(WebCore::InspectorController::didBeginFrame): Deleted.
(WebCore::InspectorController::didCancelFrame): Deleted.
(WebCore::InspectorController::didComposite): Deleted.
(WebCore::InspectorController::wilComposite): Deleted.
* inspector/InspectorController.h:
* inspector/InspectorTimelineAgent.cpp: Remove the backend's BeginFrame enum
value, but keep it in the protocol for when it is reimplemented. Remove
management of the current frame record, and simplify some code.
(WebCore::toProtocol):
(WebCore::InspectorTimelineAgent::addRecordToTimeline):
(WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
(WebCore::InspectorTimelineAgent::pushCurrentRecord):
(WebCore::InspectorTimelineAgent::clearRecordStack):
(WebCore::InspectorTimelineAgent::canMonitorMainThread): Deleted.
(WebCore::InspectorTimelineAgent::supportsFrameInstrumentation): Deleted.
(WebCore::InspectorTimelineAgent::didBeginFrame): Deleted.
(WebCore::InspectorTimelineAgent::didCancelFrame): Deleted.
(WebCore::InspectorTimelineAgent::didComposite): Deleted.
(WebCore::InspectorTimelineAgent::wilComposite): Deleted.
(WebCore::InspectorTimelineAgent::innerAddRecordToTimeline): Deleted. Undo telescoping.
(WebCore::usedHeapSize): Deleted.
(WebCore::InspectorTimelineAgent::commitFrameRecord): Deleted.
* inspector/InspectorTimelineAgent.h:
(WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
* inspector/protocol/Timeline.json:
* platform/graphics/texmap/coordinated/CompositingCoordinator.cpp: Remove
instrumentation hook for beginFrame. This is the only backend that implements it.
(WebCore::CompositingCoordinator::syncDisplayState):
* testing/Internals.cpp: Remove crufty test methods that aren't used.
(WebCore::Internals::emitInspectorDidBeginFrame): Deleted.
(WebCore::Internals::emitInspectorDidCancelFrame): Deleted.
* testing/Internals.h:
* testing/Internals.idl:
Source/WebInspectorUI:
Remove the Memory domain from old protocol versions. Remove enum values
BeginFrame and CompositeLayers. Remove arguments to Timeline.start.
Remove miscellaneous Timeline commands that no longer exist and were never used.
* UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js:
* UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js:
* Versions/Inspector-iOS-6.0.json:
* Versions/Inspector-iOS-7.0.json:
Source/WebKit:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Remove symbols.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorClienth">trunk/Source/WebCore/inspector/InspectorClient.h</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="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorprotocolTimelinejson">trunk/Source/WebCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLegacy60InspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolLegacy70InspectorWebBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS60json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json</a></li>
<li><a href="#trunkSourceWebInspectorUIVersionsInspectoriOS70json">trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/ChangeLog 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2014-04-05 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove unused metrics and commands from the Timeline agent
+ https://bugs.webkit.org/show_bug.cgi?id=131184
+
+ Reviewed by Timothy Hatcher.
+
+ This patch removes several instrumentation hooks that are not being
+ used by the frontend in any way. Most of them are not hooked up to
+ produce any data, so they just clutter up InspectorClient and the agent.
+
+ * WebCore.exp.in: Remove didBeginFrame/didCancelFrame.
+ * inspector/InspectorClient.h: Remove client methods that are never overridden.
+ (WebCore::InspectorClient::canMonitorMainThread): Deleted.
+ (WebCore::InspectorClient::supportsFrameInstrumentation): Deleted.
+ (WebCore::InspectorClient::getAllocatedObjects): Deleted.
+ (WebCore::InspectorClient::dumpUncountedAllocatedObjects): Deleted.
+
+ * inspector/InspectorController.cpp: Remove unused instrumentation.
+ (WebCore::InspectorController::didBeginFrame): Deleted.
+ (WebCore::InspectorController::didCancelFrame): Deleted.
+ (WebCore::InspectorController::didComposite): Deleted.
+ (WebCore::InspectorController::wilComposite): Deleted.
+ * inspector/InspectorController.h:
+
+ * inspector/InspectorTimelineAgent.cpp: Remove the backend's BeginFrame enum
+ value, but keep it in the protocol for when it is reimplemented. Remove
+ management of the current frame record, and simplify some code.
+ (WebCore::toProtocol):
+ (WebCore::InspectorTimelineAgent::addRecordToTimeline):
+ (WebCore::InspectorTimelineAgent::didCompleteCurrentRecord):
+ (WebCore::InspectorTimelineAgent::pushCurrentRecord):
+ (WebCore::InspectorTimelineAgent::clearRecordStack):
+ (WebCore::InspectorTimelineAgent::canMonitorMainThread): Deleted.
+ (WebCore::InspectorTimelineAgent::supportsFrameInstrumentation): Deleted.
+ (WebCore::InspectorTimelineAgent::didBeginFrame): Deleted.
+ (WebCore::InspectorTimelineAgent::didCancelFrame): Deleted.
+ (WebCore::InspectorTimelineAgent::didComposite): Deleted.
+ (WebCore::InspectorTimelineAgent::wilComposite): Deleted.
+ (WebCore::InspectorTimelineAgent::innerAddRecordToTimeline): Deleted. Undo telescoping.
+ (WebCore::usedHeapSize): Deleted.
+ (WebCore::InspectorTimelineAgent::commitFrameRecord): Deleted.
+ * inspector/InspectorTimelineAgent.h:
+ (WebCore::InspectorTimelineAgent::TimelineRecordEntry::TimelineRecordEntry):
+ * inspector/protocol/Timeline.json:
+
+ * platform/graphics/texmap/coordinated/CompositingCoordinator.cpp: Remove
+ instrumentation hook for beginFrame. This is the only backend that implements it.
+ (WebCore::CompositingCoordinator::syncDisplayState):
+
+ * testing/Internals.cpp: Remove crufty test methods that aren't used.
+ (WebCore::Internals::emitInspectorDidBeginFrame): Deleted.
+ (WebCore::Internals::emitInspectorDidCancelFrame): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2014-04-05 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r163914): Application cache cannot be used in main frame
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -3021,8 +3021,6 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> __ZN7WebCore14SchemeRegistry27shouldTreatURLSchemeAsLocalERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore15InspectorClient31doDispatchMessageOnFrontendPageEPNS_4PageERKN3WTF6StringE
</span><del>-__ZN7WebCore19InspectorController13didBeginFrameEv
-__ZN7WebCore19InspectorController14didCancelFrameEv
</del><span class="cx"> __ZN7WebCore19InspectorController15connectFrontendEPN9Inspector24InspectorFrontendChannelE
</span><span class="cx"> __ZN7WebCore19InspectorController18disconnectFrontendEN9Inspector25InspectorDisconnectReasonE
</span><span class="cx"> __ZN7WebCore19InspectorController18setProfilerEnabledEb
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorClient.h (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorClient.h 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/inspector/InspectorClient.h 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> virtual void clearBrowserCache() { }
</span><span class="cx"> virtual bool canClearBrowserCookies() { return false; }
</span><span class="cx"> virtual void clearBrowserCookies() { }
</span><del>- virtual bool canMonitorMainThread() { return false; }
</del><span class="cx">
</span><span class="cx"> virtual bool overridesShowPaintRects() { return false; }
</span><span class="cx"> virtual void setShowPaintRects(bool) { }
</span><span class="lines">@@ -77,13 +76,8 @@
</span><span class="cx"> virtual bool canContinuouslyPaint() { return false; }
</span><span class="cx"> virtual void setContinuousPaintingEnabled(bool) { }
</span><span class="cx">
</span><del>- virtual bool supportsFrameInstrumentation() { return false; }
-
</del><span class="cx"> virtual void didSetSearchingForNode(bool) { }
</span><span class="cx">
</span><del>- virtual void getAllocatedObjects(HashSet<const void*>&) { }
- virtual void dumpUncountedAllocatedObjects(const HashMap<const void*, size_t>&) { }
-
</del><span class="cx"> virtual bool handleJavaScriptDialog(bool, const String*) { return false; }
</span><span class="cx">
</span><span class="cx"> static bool doDispatchMessageOnFrontendPage(Page* frontendPage, const String& message);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -401,30 +401,6 @@
</span><span class="cx"> m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorController::didBeginFrame()
-{
- if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->didBeginFrame();
-}
-
-void InspectorController::didCancelFrame()
-{
- if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->didCancelFrame();
-}
-
-void InspectorController::willComposite()
-{
- if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->willComposite();
-}
-
-void InspectorController::didComposite()
-{
- if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
- timelineAgent->didComposite();
-}
-
</del><span class="cx"> bool InspectorController::developerExtrasEnabled() const
</span><span class="cx"> {
</span><span class="cx"> return m_page.settings().developerExtrasEnabled();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.h (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.h 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/inspector/InspectorController.h 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -126,11 +126,6 @@
</span><span class="cx"> InspectorClient* inspectorClient() const { return m_inspectorClient; }
</span><span class="cx"> InspectorPageAgent* pageAgent() const { return m_pageAgent; }
</span><span class="cx">
</span><del>- void didBeginFrame();
- void didCancelFrame();
- void willComposite();
- void didComposite();
-
</del><span class="cx"> virtual bool developerExtrasEnabled() const override;
</span><span class="cx"> virtual bool canAccessInspectedScriptState(JSC::ExecState*) const override;
</span><span class="cx"> virtual Inspector::InspectorFunctionCallHandler functionCallHandler() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -165,8 +165,6 @@
</span><span class="cx"> static void didScrollLayer(Frame*);
</span><span class="cx"> static void willPaint(RenderObject*);
</span><span class="cx"> static void didPaint(RenderObject*, GraphicsContext*, const LayoutRect&);
</span><del>- static void willComposite(Page*);
- static void didComposite(Page*);
</del><span class="cx"> static InspectorInstrumentationCookie willRecalculateStyle(Document*);
</span><span class="cx"> static void didRecalculateStyle(const InspectorInstrumentationCookie&);
</span><span class="cx"> static void didScheduleStyleRecalculation(Document*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -116,26 +116,6 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::canMonitorMainThread(ErrorString*, bool* result)
-{
- *result = m_client && m_client->canMonitorMainThread();
-}
-
-void InspectorTimelineAgent::supportsFrameInstrumentation(ErrorString*, bool* result)
-{
- *result = m_client && m_client->supportsFrameInstrumentation();
-}
-
-void InspectorTimelineAgent::didBeginFrame()
-{
- m_pendingFrameRecord = TimelineRecordFactory::createGenericRecord(timestamp(), 0);
-}
-
-void InspectorTimelineAgent::didCancelFrame()
-{
- m_pendingFrameRecord.clear();
-}
-
</del><span class="cx"> void InspectorTimelineAgent::willCallFunction(const String& scriptName, int scriptLine, Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> pushCurrentRecord(TimelineRecordFactory::createFunctionCallData(scriptName, scriptLine), TimelineRecordType::FunctionCall, true, frame);
</span><span class="lines">@@ -253,16 +233,6 @@
</span><span class="cx"> didCompleteCurrentRecord(TimelineRecordType::ScrollLayer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::willComposite()
-{
- pushCurrentRecord(InspectorObject::create(), TimelineRecordType::CompositeLayers, false, nullptr);
-}
-
-void InspectorTimelineAgent::didComposite()
-{
- didCompleteCurrentRecord(TimelineRecordType::CompositeLayers);
-}
-
</del><span class="cx"> void InspectorTimelineAgent::willWriteHTML(unsigned startLine, Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> pushCurrentRecord(TimelineRecordFactory::createParseHTMLData(startLine), TimelineRecordType::ParseHTML, true, frame);
</span><span class="lines">@@ -470,19 +440,11 @@
</span><span class="cx"> appendRecord(TimelineRecordFactory::createProbeSampleData(action, hitCount), TimelineRecordType::ProbeSample, false, frame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<InspectorObject> record, TimelineRecordType type)
-{
- commitFrameRecord();
- innerAddRecordToTimeline(record, type);
-}
-
</del><span class="cx"> static Inspector::TypeBuilder::Timeline::EventType::Enum toProtocol(TimelineRecordType type)
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="cx"> case TimelineRecordType::EventDispatch:
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::EventDispatch;
</span><del>- case TimelineRecordType::BeginFrame:
- return Inspector::TypeBuilder::Timeline::EventType::BeginFrame;
</del><span class="cx"> case TimelineRecordType::ScheduleStyleRecalculation:
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::ScheduleStyleRecalculation;
</span><span class="cx"> case TimelineRecordType::RecalculateStyles:
</span><span class="lines">@@ -497,8 +459,6 @@
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::ScrollLayer;
</span><span class="cx"> case TimelineRecordType::ResizeImage:
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::ResizeImage;
</span><del>- case TimelineRecordType::CompositeLayers:
- return Inspector::TypeBuilder::Timeline::EventType::CompositeLayers;
</del><span class="cx">
</span><span class="cx"> case TimelineRecordType::ParseHTML:
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::ParseHTML;
</span><span class="lines">@@ -566,7 +526,7 @@
</span><span class="cx"> return Inspector::TypeBuilder::Timeline::EventType::TimeStamp;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::innerAddRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, TimelineRecordType type)
</del><ins>+void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, TimelineRecordType type)
</ins><span class="cx"> {
</span><span class="cx"> prpRecord->setString("type", Inspector::TypeBuilder::getWebEnumConstantValue(toProtocol(type)));
</span><span class="cx">
</span><span class="lines">@@ -580,11 +540,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static size_t usedHeapSize()
-{
- return JSDOMWindow::commonVM().heap.size();
-}
-
</del><span class="cx"> void InspectorTimelineAgent::setFrameIdentifier(InspectorObject* record, Frame* frame)
</span><span class="cx"> {
</span><span class="cx"> if (!frame || !m_pageAgent)
</span><span class="lines">@@ -606,9 +561,6 @@
</span><span class="cx"> entry.record->setObject("data", entry.data);
</span><span class="cx"> entry.record->setArray("children", entry.children);
</span><span class="cx"> entry.record->setNumber("endTime", timestamp());
</span><del>- size_t usedHeapSizeDelta = usedHeapSize() - entry.usedHeapSizeAtStart;
- if (usedHeapSizeDelta)
- entry.record->setNumber("usedHeapSizeDelta", usedHeapSizeDelta);
</del><span class="cx"> addRecordToTimeline(entry.record, type);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -643,24 +595,13 @@
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::pushCurrentRecord(PassRefPtr<InspectorObject> data, TimelineRecordType type, bool captureCallStack, Frame* frame)
</span><span class="cx"> {
</span><del>- commitFrameRecord();
</del><span class="cx"> RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(timestamp(), captureCallStack ? m_maxCallStackDepth : 0);
</span><span class="cx"> setFrameIdentifier(record.get(), frame);
</span><del>- m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type, usedHeapSize()));
</del><ins>+ m_recordStack.append(TimelineRecordEntry(record.release(), data, InspectorArray::create(), type));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::commitFrameRecord()
-{
- if (!m_pendingFrameRecord)
- return;
-
- m_pendingFrameRecord->setObject("data", InspectorObject::create());
- innerAddRecordToTimeline(m_pendingFrameRecord.release(), TimelineRecordType::BeginFrame);
-}
-
</del><span class="cx"> void InspectorTimelineAgent::clearRecordStack()
</span><span class="cx"> {
</span><del>- m_pendingFrameRecord.clear();
</del><span class="cx"> m_recordStack.clear();
</span><span class="cx"> m_id++;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx">
</span><span class="cx"> enum class TimelineRecordType {
</span><span class="cx"> EventDispatch,
</span><del>- BeginFrame,
</del><span class="cx"> ScheduleStyleRecalculation,
</span><span class="cx"> RecalculateStyles,
</span><span class="cx"> InvalidateLayout,
</span><span class="lines">@@ -70,7 +69,6 @@
</span><span class="cx"> Paint,
</span><span class="cx"> ScrollLayer,
</span><span class="cx"> ResizeImage,
</span><del>- CompositeLayers,
</del><span class="cx">
</span><span class="cx"> ParseHTML,
</span><span class="cx">
</span><span class="lines">@@ -138,8 +136,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void start(ErrorString*, const int* maxCallStackDepth) override;
</span><span class="cx"> virtual void stop(ErrorString*) override;
</span><del>- virtual void canMonitorMainThread(ErrorString*, bool*) override;
- virtual void supportsFrameInstrumentation(ErrorString*, bool*) override;
</del><span class="cx">
</span><span class="cx"> int id() const { return m_id; }
</span><span class="cx">
</span><span class="lines">@@ -152,9 +148,6 @@
</span><span class="cx"> void willDispatchEvent(const Event&, Frame*);
</span><span class="cx"> void didDispatchEvent();
</span><span class="cx">
</span><del>- void didBeginFrame();
- void didCancelFrame();
-
</del><span class="cx"> void didInvalidateLayout(Frame*);
</span><span class="cx"> void willLayout(Frame*);
</span><span class="cx"> void didLayout(RenderObject*);
</span><span class="lines">@@ -169,9 +162,6 @@
</span><span class="cx"> void willScroll(Frame*);
</span><span class="cx"> void didScroll();
</span><span class="cx">
</span><del>- void willComposite();
- void didComposite();
-
</del><span class="cx"> void willWriteHTML(unsigned startLine, Frame*);
</span><span class="cx"> void didWriteHTML(unsigned endLine);
</span><span class="cx">
</span><span class="lines">@@ -230,15 +220,14 @@
</span><span class="cx"> friend class TimelineRecordStack;
</span><span class="cx">
</span><span class="cx"> struct TimelineRecordEntry {
</span><del>- TimelineRecordEntry(PassRefPtr<Inspector::InspectorObject> record, PassRefPtr<Inspector::InspectorObject> data, PassRefPtr<Inspector::InspectorArray> children, TimelineRecordType type, size_t usedHeapSizeAtStart)
- : record(record), data(data), children(children), type(type), usedHeapSizeAtStart(usedHeapSizeAtStart)
</del><ins>+ TimelineRecordEntry(PassRefPtr<Inspector::InspectorObject> record, PassRefPtr<Inspector::InspectorObject> data, PassRefPtr<Inspector::InspectorArray> children, TimelineRecordType type)
+ : record(record), data(data), children(children), type(type)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> RefPtr<Inspector::InspectorObject> record;
</span><span class="cx"> RefPtr<Inspector::InspectorObject> data;
</span><span class="cx"> RefPtr<Inspector::InspectorArray> children;
</span><span class="cx"> TimelineRecordType type;
</span><del>- size_t usedHeapSizeAtStart;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> void sendEvent(PassRefPtr<Inspector::InspectorObject>);
</span><span class="lines">@@ -249,11 +238,7 @@
</span><span class="cx">
</span><span class="cx"> void didCompleteCurrentRecord(TimelineRecordType);
</span><span class="cx">
</span><del>- void setHeapSizeStatistics(Inspector::InspectorObject* record);
- void commitFrameRecord();
-
</del><span class="cx"> void addRecordToTimeline(PassRefPtr<Inspector::InspectorObject>, TimelineRecordType);
</span><del>- void innerAddRecordToTimeline(PassRefPtr<Inspector::InspectorObject>, TimelineRecordType);
</del><span class="cx"> void clearRecordStack();
</span><span class="cx">
</span><span class="cx"> void localToPageQuad(const RenderObject&, const LayoutRect&, FloatQuad*);
</span><span class="lines">@@ -272,7 +257,6 @@
</span><span class="cx">
</span><span class="cx"> int m_id;
</span><span class="cx"> int m_maxCallStackDepth;
</span><del>- RefPtr<Inspector::InspectorObject> m_pendingFrameRecord;
</del><span class="cx"> InspectorType m_inspectorType;
</span><span class="cx"> InspectorClient* m_client;
</span><span class="cx"> WeakPtrFactory<InspectorTimelineAgent> m_weakFactory;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/protocol/Timeline.json (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/protocol/Timeline.json 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/inspector/protocol/Timeline.json 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> {
</span><span class="cx"> "id": "EventType",
</span><span class="cx"> "type": "string",
</span><del>- "enum": ["EventDispatch", "BeginFrame", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "CompositeLayers", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "ProbeSample", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</del><ins>+ "enum": ["EventDispatch", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "ProbeSample", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</ins><span class="cx"> "description": "Timeline record type."
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -13,10 +13,8 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "type", "$ref": "EventType", "description": "Event type." },
</span><del>- { "name": "thread", "type": "string", "optional": true, "description": "If present, identifies the thread that produced the event." },
</del><span class="cx"> { "name": "data", "type": "object", "description": "Event data." },
</span><del>- { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." },
- { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." }
</del><ins>+ { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Timeline record contains information about the recorded activity."
</span><span class="cx"> }
</span><span class="lines">@@ -32,20 +30,6 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "stop",
</span><span class="cx"> "description": "Stops capturing instrumentation events."
</span><del>- },
- {
- "name": "supportsFrameInstrumentation",
- "returns": [
- { "name": "result", "type": "boolean", "description": "True if timeline supports frame instrumentation." }
- ],
- "description": "Tells whether timeline agent supports frame instrumentation."
- },
- {
- "name": "canMonitorMainThread",
- "returns": [
- { "name": "result", "type": "boolean", "description": "True if timeline supports main thread CPU utilization instrumentation." }
- ],
- "description": "Tells whether timeline agent supports main thread CPU utilization instrumentation."
</del><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "events": [
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCompositingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CompositingCoordinator.cpp 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -125,10 +125,6 @@
</span><span class="cx">
</span><span class="cx"> void CompositingCoordinator::syncDisplayState()
</span><span class="cx"> {
</span><del>-#if ENABLE(INSPECTOR)
- m_page->inspectorController().didBeginFrame();
-#endif
-
</del><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER) && !USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><span class="cx"> // Make sure that any previously registered animation callbacks are being executed before we flush the layers.
</span><span class="cx"> m_lastAnimationServiceTime = WTF::monotonicallyIncreasingTime();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -1164,20 +1164,6 @@
</span><span class="cx"> return StaticNodeList::adopt(matches);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::emitInspectorDidBeginFrame()
-{
-#if ENABLE(INSPECTOR)
- contextDocument()->frame()->page()->inspectorController().didBeginFrame();
-#endif
-}
-
-void Internals::emitInspectorDidCancelFrame()
-{
-#if ENABLE(INSPECTOR)
- contextDocument()->frame()->page()->inspectorController().didCancelFrame();
-#endif
-}
-
</del><span class="cx"> class GetCallerCodeBlockFunctor {
</span><span class="cx"> public:
</span><span class="cx"> GetCallerCodeBlockFunctor()
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/testing/Internals.h 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -166,9 +166,6 @@
</span><span class="cx"> PassRefPtr<NodeList> nodesFromRect(Document*, int x, int y, unsigned topPadding, unsigned rightPadding,
</span><span class="cx"> unsigned bottomPadding, unsigned leftPadding, bool ignoreClipping, bool allowShadowContent, bool allowChildFrameContent, ExceptionCode&) const;
</span><span class="cx">
</span><del>- void emitInspectorDidBeginFrame();
- void emitInspectorDidCancelFrame();
-
</del><span class="cx"> String parserMetaData(Deprecated::ScriptValue = Deprecated::ScriptValue());
</span><span class="cx">
</span><span class="cx"> Node* findEditingDeleteButton();
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebCore/testing/Internals.idl 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -124,9 +124,6 @@
</span><span class="cx"> unsigned long topPadding, unsigned long rightPadding, unsigned long bottomPadding, unsigned long leftPadding,
</span><span class="cx"> boolean ignoreClipping, boolean allowShadowContent, boolean allowChildFrameContent);
</span><span class="cx">
</span><del>- void emitInspectorDidBeginFrame();
- void emitInspectorDidCancelFrame();
-
</del><span class="cx"> // Calling parserMetaData() with no arguments gets the metadata for the script of the current scope.
</span><span class="cx"> DOMString parserMetaData(optional any func);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-05 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove unused metrics and commands from the Timeline agent
+ https://bugs.webkit.org/show_bug.cgi?id=131184
+
+ Reviewed by Timothy Hatcher.
+
+ Remove the Memory domain from old protocol versions. Remove enum values
+ BeginFrame and CompositeLayers. Remove arguments to Timeline.start.
+ Remove miscellaneous Timeline commands that no longer exist and were never used.
+
+ * UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js:
+ * UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js:
+ * Versions/Inspector-iOS-6.0.json:
+ * Versions/Inspector-iOS-7.0.json:
+
</ins><span class="cx"> 2014-04-03 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: hook up probe samples to TimelineAgent's records
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLegacy60InspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -15,10 +15,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("Inspector.enable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Inspector.disable", [], []);
</span><span class="cx">
</span><del>-// Memory.
-InspectorBackend.registerMemoryDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Memory");
-InspectorBackend.registerCommand("Memory.getDOMNodeCount", [], ["domGroups", "strings"]);
-
</del><span class="cx"> // Page.
</span><span class="cx"> InspectorBackend.registerPageDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Page");
</span><span class="cx"> InspectorBackend.registerEnum("Page.ResourceType", {Document: "Document", Stylesheet: "Stylesheet", Image: "Image", Font: "Font", Script: "Script", XHR: "XHR", WebSocket: "WebSocket", Other: "Other"});
</span><span class="lines">@@ -194,11 +190,10 @@
</span><span class="cx">
</span><span class="cx"> // Timeline.
</span><span class="cx"> InspectorBackend.registerTimelineDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Timeline");
</span><del>-InspectorBackend.registerEnum("Timeline.EventType", {EventDispatch: "EventDispatch", Layout: "Layout", RecalculateStyles: "RecalculateStyles", Paint: "Paint", BeginFrame: "BeginFrame", ParseHTML: "ParseHTML", TimerInstall: "TimerInstall", TimerRemove: "TimerRemove", TimerFire: "TimerFire", EvaluateScript: "EvaluateScript", MarkLoad: "MarkLoad", MarkDOMContent: "MarkDOMContent", TimeStamp: "TimeStamp", ScheduleResourceRequest: "ScheduleResourceRequest", ResourceSendRequest: "ResourceSendRequest", ResourceReceiveResponse: "ResourceReceiveResponse", ResourceReceivedData: "ResourceReceivedData", ResourceFinish: "ResourceFinish", XHRReadyStateChange: "XHRReadyStateChange", XHRLoad: "XHRLoad", FunctionCall: "FunctionCall", GCEvent: "GCEvent", RequestAnimationFrame: "RequestAnimationFrame", CancelAnimationFrame: "CancelAnimationFrame", FireAnimationFrame: "FireAnimationFrame"});
</del><ins>+InspectorBackend.registerEnum("Timeline.EventType", {EventDispatch: "EventDispatch", Layout: "Layout", RecalculateStyles: "RecalculateStyles", Paint: "Paint", ParseHTML: "ParseHTML", TimerInstall: "TimerInstall", TimerRemove: "TimerRemove", TimerFire: "TimerFire", EvaluateScript: "EvaluateScript", MarkLoad: "MarkLoad", MarkDOMContent: "MarkDOMContent", TimeStamp: "TimeStamp", ScheduleResourceRequest: "ScheduleResourceRequest", ResourceSendRequest: "ResourceSendRequest", ResourceReceiveResponse: "ResourceReceiveResponse", ResourceReceivedData: "ResourceReceivedData", ResourceFinish: "ResourceFinish", XHRReadyStateChange: "XHRReadyStateChange", XHRLoad: "XHRLoad", FunctionCall: "FunctionCall", GCEvent: "GCEvent", RequestAnimationFrame: "RequestAnimationFrame", CancelAnimationFrame: "CancelAnimationFrame", FireAnimationFrame: "FireAnimationFrame"});
</ins><span class="cx"> InspectorBackend.registerEvent("Timeline.eventRecorded", ["record"]);
</span><span class="cx"> InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Timeline.stop", [], []);
</span><del>-InspectorBackend.registerCommand("Timeline.setIncludeMemoryDetails", [{"name": "enabled", "type": "boolean", "optional": false}], []);
</del><span class="cx">
</span><span class="cx"> // Debugger.
</span><span class="cx"> InspectorBackend.registerDebuggerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Debugger");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolLegacy70InspectorWebBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -15,10 +15,6 @@
</span><span class="cx"> InspectorBackend.registerCommand("Inspector.enable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Inspector.disable", [], []);
</span><span class="cx">
</span><del>-// Memory.
-InspectorBackend.registerMemoryDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Memory");
-InspectorBackend.registerCommand("Memory.getDOMCounters", [], ["documents", "nodes", "jsEventListeners"]);
-
</del><span class="cx"> // Page.
</span><span class="cx"> InspectorBackend.registerPageDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Page");
</span><span class="cx"> InspectorBackend.registerEnum("Page.ResourceType", {Document: "Document", Stylesheet: "Stylesheet", Image: "Image", Font: "Font", Script: "Script", XHR: "XHR", WebSocket: "WebSocket", Other: "Other"});
</span><span class="lines">@@ -230,12 +226,10 @@
</span><span class="cx">
</span><span class="cx"> // Timeline.
</span><span class="cx"> InspectorBackend.registerTimelineDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Timeline");
</span><del>-InspectorBackend.registerEnum("Timeline.EventType", {EventDispatch: "EventDispatch", BeginFrame: "BeginFrame", ScheduleStyleRecalculation: "ScheduleStyleRecalculation", RecalculateStyles: "RecalculateStyles", InvalidateLayout: "InvalidateLayout", Layout: "Layout", Paint: "Paint", ScrollLayer: "ScrollLayer", ResizeImage: "ResizeImage", CompositeLayers: "CompositeLayers", ParseHTML: "ParseHTML", TimerInstall: "TimerInstall", TimerRemove: "TimerRemove", TimerFire: "TimerFire", EvaluateScript: "EvaluateScript", MarkLoad: "MarkLoad", MarkDOMContent: "MarkDOMContent", TimeStamp: "TimeStamp", Time: "Time", TimeEnd: "TimeEnd", ScheduleResourceRequest: "ScheduleResourceRequest", ResourceSendRequest: "ResourceSendRequest", ResourceReceiveResponse: "ResourceReceiveResponse", ResourceReceivedData: "ResourceReceivedData", ResourceFinish: "ResourceFinish", XHRReadyStateChange: "XHRReadyStateChange", XHRLoad: "XHRLoad", FunctionCall: "FunctionCall", GCEvent: "GCEvent", RequestAnimationFrame: "RequestAnimationFrame", CancelAnimationFrame: "CancelAnimationFrame", FireAnimationFrame: "FireAnimationFrame", WebSocketCreate: "WebSocketCreate", WebSocketSendHandshakeRequest: "WebSocketSendHandshakeRequest", WebSocketReceiveHandshakeResponse: "WebSocketReceiveHandshakeResponse", WebSocketDestroy: "WebSocketDestroy"});
</del><ins>+InspectorBackend.registerEnum("Timeline.EventType", {EventDispatch: "EventDispatch", ScheduleStyleRecalculation: "ScheduleStyleRecalculation", RecalculateStyles: "RecalculateStyles", InvalidateLayout: "InvalidateLayout", Layout: "Layout", Paint: "Paint", ScrollLayer: "ScrollLayer", ResizeImage: "ResizeImage", ParseHTML: "ParseHTML", TimerInstall: "TimerInstall", TimerRemove: "TimerRemove", TimerFire: "TimerFire", EvaluateScript: "EvaluateScript", MarkLoad: "MarkLoad", MarkDOMContent: "MarkDOMContent", TimeStamp: "TimeStamp", Time: "Time", TimeEnd: "TimeEnd", ScheduleResourceRequest: "ScheduleResourceRequest", ResourceSendRequest: "ResourceSendRequest", ResourceReceiveResponse: "ResourceReceiveResponse", ResourceReceivedData: "ResourceReceivedData", ResourceFinish: "ResourceFinish", XHRReadyStateChange: "XHRReadyStateChange", XHRLoad: "XHRLoad", FunctionCall: "FunctionCall", GCEvent: "GCEvent", RequestAnimationFrame: "RequestAnimationFrame", CancelAnimationFrame: "CancelAnimationFrame", FireAnimationFrame: "FireAnimationFrame", WebSocketCreate: "WebSocketCreate", WebSocketSendHandshakeRequest: "WebSocketSendHandshakeRequest", WebSocketReceiveHandshakeResponse: "WebSocketReceiveHandshakeResponse", WebSocketDestroy: "WebSocketDestroy"});
</ins><span class="cx"> InspectorBackend.registerEvent("Timeline.eventRecorded", ["record"]);
</span><del>-InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}, {"name": "includeDomCounters", "type": "boolean", "optional": true}, {"name": "includeNativeMemoryStatistics", "type": "boolean", "optional": true}], []);
</del><ins>+InspectorBackend.registerCommand("Timeline.start", [{"name": "maxCallStackDepth", "type": "number", "optional": true}], []);
</ins><span class="cx"> InspectorBackend.registerCommand("Timeline.stop", [], []);
</span><del>-InspectorBackend.registerCommand("Timeline.supportsFrameInstrumentation", [], ["result"]);
-InspectorBackend.registerCommand("Timeline.canMonitorMainThread", [], ["result"]);
</del><span class="cx">
</span><span class="cx"> // Debugger.
</span><span class="cx"> InspectorBackend.registerDebuggerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Debugger");
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS60json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-6.0.json 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -46,60 +46,6 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "domain": "Memory",
- "hidden": true,
- "types": [
- {
- "id": "NodeCount",
- "type": "object",
- "properties": [
- { "name": "nodeName", "type": "string" },
- { "name": "count", "type": "integer" }
- ],
- "description": "Number of nodes with given name."
- },
- {
- "id": "ListenerCount",
- "type": "object",
- "properties": [
- { "name": "type", "type": "string" },
- { "name": "count", "type": "integer" }
- ],
- "description": "Number of JS event listeners by event type."
- },
- {
- "id": "StringStatistics",
- "type": "object",
- "properties": [
- { "name": "dom", "type": "integer" },
- { "name": "js", "type": "integer" },
- { "name": "shared", "type": "integer" }
- ],
- "description": "Character data statistics for the page."
- },
- {
- "id": "DOMGroup",
- "type": "object",
- "properties": [
- { "name": "size", "type": "integer" },
- { "name": "title", "type": "string" },
- { "name": "documentURI", "type": "string", "optional": true },
- { "name": "nodeCount", "type": "array", "items": { "$ref": "NodeCount" }},
- { "name": "listenerCount", "type": "array", "items": { "$ref": "ListenerCount" }}
- ]
- }
- ],
- "commands": [
- {
- "name": "getDOMNodeCount",
- "returns": [
- { "name": "domGroups", "type": "array", "items": { "$ref": "DOMGroup" }},
- { "name": "strings", "$ref": "StringStatistics" }
- ]
- }
- ]
- },
- {
</del><span class="cx"> "domain": "Page",
</span><span class="cx"> "description": "Actions and events related to the inspected page belong to the page domain.",
</span><span class="cx"> "types": [
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIVersionsInspectoriOS70json"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebInspectorUI/Versions/Inspector-iOS-7.0.json 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -42,30 +42,6 @@
</span><span class="cx"> ]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "domain": "Memory",
- "types": [
- {
- "id": "MemoryBlock",
- "type": "object",
- "properties": [
- { "name": "size", "type": "number", "optional": true, "description": "Size of the block in bytes if available" },
- { "name": "name", "type": "string", "description": "Unique name used to identify the component that allocated this block" },
- { "name": "children", "type": "array", "optional": true, "items": { "$ref": "MemoryBlock" }}
- ]
- }
- ],
- "commands": [
- {
- "name": "getDOMCounters",
- "returns": [
- { "name": "documents", "type": "integer" },
- { "name": "nodes", "type": "integer" },
- { "name": "jsEventListeners", "type": "integer" }
- ]
- }
- ]
- },
- {
</del><span class="cx"> "domain": "Page",
</span><span class="cx"> "description": "Actions and events related to the inspected page belong to the page domain.",
</span><span class="cx"> "types": [
</span><span class="lines">@@ -2223,19 +2199,9 @@
</span><span class="cx"> "description": "Timeline provides its clients with instrumentation records that are generated during the page runtime. Timeline instrumentation can be started and stopped using corresponding commands. While timeline is started, it is generating timeline event records.",
</span><span class="cx"> "types": [
</span><span class="cx"> {
</span><del>- "id": "DOMCounters",
- "type": "object",
- "properties": [
- { "name": "documents", "type": "integer" },
- { "name": "nodes", "type": "integer" },
- { "name": "jsEventListeners", "type": "integer" }
- ],
- "description": "Current values of DOM counters."
- },
- {
</del><span class="cx"> "id": "EventType",
</span><span class="cx"> "type": "string",
</span><del>- "enum": ["EventDispatch", "BeginFrame", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "CompositeLayers", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</del><ins>+ "enum": ["EventDispatch", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</ins><span class="cx"> "description": "Timeline record type."
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -2243,12 +2209,8 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "type", "type": "string", "description": "Event type." },
</span><del>- { "name": "thread", "type": "string", "optional": true, "description": "If present, identifies the thread that produced the event." },
</del><span class="cx"> { "name": "data", "type": "object", "description": "Event data." },
</span><del>- { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." },
- { "name": "counters", "$ref": "DOMCounters", "optional": true, "description": "Current values of DOM counters." },
- { "name": "usedHeapSize", "type": "integer", "optional": true, "description": "Current size of JS heap." },
- { "name": "nativeHeapStatistics", "type": "object", "optional": true, "description": "Native heap statistics." }
</del><ins>+ { "name": "children", "type": "array", "optional": true, "items": { "$ref": "TimelineEvent" }, "description": "Nested records." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Timeline record contains information about the recorded activity."
</span><span class="cx"> }
</span><span class="lines">@@ -2257,29 +2219,13 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "start",
</span><span class="cx"> "parameters": [
</span><del>- { "name": "maxCallStackDepth", "optional": true, "type": "integer", "description": "Samples JavaScript stack traces up to <code>maxCallStackDepth</code>, defaults to 5." },
- { "name": "includeDomCounters", "optional": true, "type": "boolean", "description": "Whether DOM counters data should be included into timeline events." },
- { "name": "includeNativeMemoryStatistics", "optional": true, "type": "boolean", "description": "Whether native memory usage statistics should be reported as part of timeline events." }
</del><ins>+ { "name": "maxCallStackDepth", "optional": true, "type": "integer", "description": "Samples JavaScript stack traces up to <code>maxCallStackDepth</code>, defaults to 5." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Starts capturing instrumentation events."
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "stop",
</span><span class="cx"> "description": "Stops capturing instrumentation events."
</span><del>- },
- {
- "name": "supportsFrameInstrumentation",
- "returns": [
- { "name": "result", "type": "boolean", "description": "True if timeline supports frame instrumentation." }
- ],
- "description": "Tells whether timeline agent supports frame instrumentation."
- },
- {
- "name": "canMonitorMainThread",
- "returns": [
- { "name": "result", "type": "boolean", "description": "True if timeline supports main thread CPU utilization instrumentation." }
- ],
- "description": "Tells whether timeline agent supports main thread CPU utilization instrumentation."
</del><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "events": [
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebKit/ChangeLog 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-05 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: remove unused metrics and commands from the Timeline agent
+ https://bugs.webkit.org/show_bug.cgi?id=131184
+
+ Reviewed by Timothy Hatcher.
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in: Remove symbols.
+
</ins><span class="cx"> 2014-04-04 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (166845 => 166846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-04-06 00:50:33 UTC (rev 166845)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2014-04-06 00:51:14 UTC (rev 166846)
</span><span class="lines">@@ -124,10 +124,6 @@
</span><span class="cx"> symbolWithPointer(?addTextMatchMarker@DocumentMarkerController@WebCore@@QAEXPBVRange@2@_N@Z, ?addTextMatchMarker@DocumentMarkerController@WebCore@@QEAAXPEBVRange@2@_N@Z)
</span><span class="cx"> symbolWithPointer(?broadcast@ThreadCondition@WTF@@QAEXXZ, ?broadcast@ThreadCondition@WTF@@QEAAXXZ)
</span><span class="cx"> symbolWithPointer(?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z, ?callOnMainThread@WTF@@YAXP6AXPEAX@Z0@Z)
</span><del>-#if ENABLE(INSPECTOR)
- symbolWithPointer(?didBeginFrame@InspectorController@WebCore@@QAEXXZ, ?didBeginFrame@InspectorController@WebCore@@QEAAXXZ)
- symbolWithPointer(?didCancelFrame@InspectorController@WebCore@@QAEXXZ, ?didCancelFrame@InspectorController@WebCore@@QEAAXXZ)
-#endif
</del><span class="cx"> symbolWithPointer(?counterValueForElement@WebCore@@YA?AVString@WTF@@PAVElement@1@@Z, ?counterValueForElement@WebCore@@YA?AVString@WTF@@PEAVElement@1@@Z)
</span><span class="cx"> symbolWithPointer(?createThread@WTF@@YAIP6APAXPAX@Z0PBD@Z, ?createThread@WTF@@YAIP6APEAXPEAX@Z0PEBD@Z)
</span><span class="cx"> symbolWithPointer(?createThread@WTF@@YAIP6AXPAX@Z0PBD@Z, ?createThread@WTF@@YAIP6AXPEAX@Z0PEBD@Z)
</span></span></pre>
</div>
</div>
</body>
</html>