<!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>[197826] trunk</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/197826">197826</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-08 18:06:45 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add Heap domain start/stop tracking commands
https://bugs.webkit.org/show_bug.cgi?id=155190
Reviewed by Brian Burg.
Source/JavaScriptCore:
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::InspectorHeapAgent::willDestroyFrontendAndBackend):
(Inspector::InspectorHeapAgent::startTracking):
(Inspector::InspectorHeapAgent::stopTracking):
* inspector/agents/InspectorHeapAgent.h:
* inspector/protocol/Heap.json:
Source/WebInspectorUI:
* UserInterface/Protocol/HeapObserver.js:
(WebInspector.HeapObserver.prototype.trackingStart):
(WebInspector.HeapObserver.prototype.trackingComplete):
To be used when we have a HeapAllocationsInstrument and timeline.
LayoutTests:
* inspector/heap/tracking-expected.txt: Added.
* inspector/heap/tracking.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolHeapjson">trunk/Source/JavaScriptCore/inspector/protocol/Heap.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolHeapObserverjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/HeapObserver.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorheaptrackingexpectedtxt">trunk/LayoutTests/inspector/heap/tracking-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorheaptrackinghtml">trunk/LayoutTests/inspector/heap/tracking.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (197825 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-09 02:05:13 UTC (rev 197825)
+++ trunk/LayoutTests/ChangeLog 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2016-03-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add Heap domain start/stop tracking commands
+ https://bugs.webkit.org/show_bug.cgi?id=155190
+
+ Reviewed by Brian Burg.
+
+ * inspector/heap/tracking-expected.txt: Added.
+ * inspector/heap/tracking.html: Added.
+
+2016-03-08 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Add a way to create a Heap Snapshot
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155188
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorheaptrackingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/heap/tracking-expected.txt (0 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/heap/tracking-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/heap/tracking-expected.txt 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+Tests that Heap.startTracking and Heap.stopTracking trigger trackingStart and trackingComplete events with expected data.
+
+
+== Running test suite: Heap.startTracking and Heap.stopTracking
+-- Running test case: StartAndStopTrackingIncludeSnapshots
+Heap.trackingStart
+PASS: Should have a timestamp when starting.
+PASS: Should have snapshotData when starting.
+Heap.trackingComplete
+PASS: Should have a timestamp when stopping.
+PASS: Should have snapshotData when stopping.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorheaptrackinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/heap/tracking.html (0 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/heap/tracking.html (rev 0)
+++ trunk/LayoutTests/inspector/heap/tracking.html 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/protocol-test.js"></script>
+<script>
+function test()
+{
+ let suite = ProtocolTest.createAsyncSuite("Heap.startTracking and Heap.stopTracking");
+
+ suite.addTestCase({
+ name: "StartAndStopTrackingIncludeSnapshots",
+ test: function(resolve, reject) {
+ InspectorProtocol.awaitEvent({event: "Heap.trackingStart"}).then((messageObject) => {
+ ProtocolTest.log("Heap.trackingStart");
+ ProtocolTest.expectThat(typeof messageObject.params.timestamp === "number", "Should have a timestamp when starting.");
+ ProtocolTest.expectThat(typeof messageObject.params.snapshotData === "string", "Should have snapshotData when starting.");
+ InspectorProtocol.sendCommand("Heap.stopTracking", {});
+ });
+
+ InspectorProtocol.awaitEvent({event: "Heap.trackingComplete"}).then((messageObject) => {
+ ProtocolTest.log("Heap.trackingComplete");
+ ProtocolTest.expectThat(typeof messageObject.params.timestamp === "number", "Should have a timestamp when stopping.");
+ ProtocolTest.expectThat(typeof messageObject.params.snapshotData === "string", "Should have snapshotData when stopping.");
+ resolve();
+ });
+
+ InspectorProtocol.sendCommand("Heap.startTracking", {});
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Tests that Heap.startTracking and Heap.stopTracking trigger trackingStart and trackingComplete events with expected data.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197825 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-09 02:05:13 UTC (rev 197825)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-03-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add Heap domain start/stop tracking commands
+ https://bugs.webkit.org/show_bug.cgi?id=155190
+
+ Reviewed by Brian Burg.
+
+ * inspector/agents/InspectorHeapAgent.cpp:
+ (Inspector::InspectorHeapAgent::willDestroyFrontendAndBackend):
+ (Inspector::InspectorHeapAgent::startTracking):
+ (Inspector::InspectorHeapAgent::stopTracking):
+ * inspector/agents/InspectorHeapAgent.h:
+ * inspector/protocol/Heap.json:
+
+2016-03-08 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Add a way to create a Heap Snapshot
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155188
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp (197825 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-03-09 02:05:13 UTC (rev 197825)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> void InspectorHeapAgent::willDestroyFrontendAndBackend(DisconnectReason)
</span><span class="cx"> {
</span><span class="cx"> ErrorString ignored;
</span><ins>+ stopTracking(ignored);
</ins><span class="cx"> disable(ignored);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -109,6 +110,34 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorHeapAgent::startTracking(ErrorString& errorString)
+{
+ if (m_tracking)
+ return;
+
+ m_tracking = true;
+
+ double timestamp;
+ String snapshotData;
+ snapshot(errorString, &timestamp, &snapshotData);
+
+ m_frontendDispatcher->trackingStart(timestamp, snapshotData);
+}
+
+void InspectorHeapAgent::stopTracking(ErrorString& errorString)
+{
+ if (!m_tracking)
+ return;
+
+ m_tracking = false;
+
+ double timestamp;
+ String snapshotData;
+ snapshot(errorString, &timestamp, &snapshotData);
+
+ m_frontendDispatcher->trackingComplete(timestamp, snapshotData);
+}
+
</ins><span class="cx"> static Inspector::Protocol::Heap::GarbageCollection::Type protocolTypeForHeapOperation(HeapOperation operation)
</span><span class="cx"> {
</span><span class="cx"> switch (operation) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h (197825 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h 2016-03-09 02:05:13 UTC (rev 197825)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> void disable(ErrorString&) override;
</span><span class="cx"> void gc(ErrorString&) override;
</span><span class="cx"> void snapshot(ErrorString&, double* timestamp, String* snapshotData) override;
</span><ins>+ void startTracking(ErrorString&) override;
+ void stopTracking(ErrorString&) override;
</ins><span class="cx">
</span><span class="cx"> // HeapObserver
</span><span class="cx"> void willGarbageCollect() override;
</span><span class="lines">@@ -65,6 +67,7 @@
</span><span class="cx"> InspectorEnvironment& m_environment;
</span><span class="cx">
</span><span class="cx"> bool m_enabled { false };
</span><ins>+ bool m_tracking { false };
</ins><span class="cx"> double m_gcStartTime { NAN };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolHeapjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Heap.json (197825 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Heap.json 2016-03-09 02:05:13 UTC (rev 197825)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Heap.json 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -38,6 +38,14 @@
</span><span class="cx"> { "name": "timestamp", "type": "number" },
</span><span class="cx"> { "name": "snapshotData", "$ref": "HeapSnapshotData" }
</span><span class="cx"> ]
</span><ins>+ },
+ {
+ "name": "startTracking",
+ "description": "Start tracking heap changes. This will produce a `trackingStart` event."
+ },
+ {
+ "name": "stopTracking",
+ "description": "Stop tracking heap changes. This will produce a `trackingComplete` event."
</ins><span class="cx"> }
</span><span class="cx"> ],
</span><span class="cx"> "events": [
</span><span class="lines">@@ -47,6 +55,22 @@
</span><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "collection", "type": "GarbageCollection" }
</span><span class="cx"> ]
</span><ins>+ },
+ {
+ "name": "trackingStart",
+ "description": "Tracking started.",
+ "parameters": [
+ { "name": "timestamp", "type": "number" },
+ { "name": "snapshotData", "$ref": "HeapSnapshotData", "description": "Snapshot at the start of tracking." }
+ ]
+ },
+ {
+ "name": "trackingComplete",
+ "description": "Tracking stopped.",
+ "parameters": [
+ { "name": "timestamp", "type": "number" },
+ { "name": "snapshotData", "$ref": "HeapSnapshotData", "description": "Snapshot at the end of tracking." }
+ ]
</ins><span class="cx"> }
</span><span class="cx"> ]
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (197825 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-09 02:05:13 UTC (rev 197825)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-03-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Add Heap domain start/stop tracking commands
+ https://bugs.webkit.org/show_bug.cgi?id=155190
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Protocol/HeapObserver.js:
+ (WebInspector.HeapObserver.prototype.trackingStart):
+ (WebInspector.HeapObserver.prototype.trackingComplete):
+ To be used when we have a HeapAllocationsInstrument and timeline.
+
+2016-03-08 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Make debugging Test.html easier
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=155207
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolHeapObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/HeapObserver.js (197825 => 197826)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/HeapObserver.js 2016-03-09 02:05:13 UTC (rev 197825)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/HeapObserver.js 2016-03-09 02:06:45 UTC (rev 197826)
</span><span class="lines">@@ -31,4 +31,18 @@
</span><span class="cx"> {
</span><span class="cx"> WebInspector.heapManager.garbageCollected(collection);
</span><span class="cx"> }
</span><ins>+
+ trackingStart(timestamp, snapshotData)
+ {
+ let payload = JSON.parse(snapshotData);
+ let snapshot = WebInspector.HeapSnapshot.fromPayload(payload);
+ // FIXME: Heap Allocations Timeline.
+ }
+
+ trackingComplete(timestamp, snapshotData)
+ {
+ let payload = JSON.parse(snapshotData);
+ let snapshot = WebInspector.HeapSnapshot.fromPayload(payload);
+ // FIXME: Heap Allocations Timeline.
+ }
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>