<!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>[163477] 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/163477">163477</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2014-02-05 14:21:40 -0800 (Wed, 05 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: add probe manager and model objects to the frontend
https://bugs.webkit.org/show_bug.cgi?id=127117
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
The inspector frontend now assigns breakpoint action identifiers,
rather than the backend. Remove return values containing breakpoint
identifiers, and remove tracking and assignment of action identifiers.
* inspector/ScriptDebugListener.h:
* inspector/ScriptDebugServer.cpp:
(Inspector::ScriptDebugServer::evaluateBreakpointAction):
(Inspector::ScriptDebugServer::dispatchBreakpointActionProbe):
Pass BreakpointAction by reference rather than just the action identifier.
* inspector/ScriptDebugServer.h:
* inspector/agents/InspectorDebuggerAgent.cpp:
(Inspector::objectGroupForBreakpointAction):
(Inspector::InspectorDebuggerAgent::InspectorDebuggerAgent):
(Inspector::InspectorDebuggerAgent::breakpointActionsFromProtocol):
(Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
(Inspector::InspectorDebuggerAgent::setBreakpoint):
(Inspector::InspectorDebuggerAgent::removeBreakpoint):
(Inspector::InspectorDebuggerAgent::breakpointActionProbe):
* inspector/agents/InspectorDebuggerAgent.h:
* inspector/protocol/Debugger.json: Revert change to setBreakpoint return values. Add optional identifier to breakpoint actions.
Source/WebInspectorUI:
Add the probe manager, and the following model objects:
- ProbeObject corresponds to a single probe breakpoint action.
- ProbeSetObject contains all ProbeObjects for one Breakpoint.
- ProbeSetDataFrame holds probe samples from multiple
probes fired from the same breakpoint hit/debugger pause.
- ProbeSetDataTable keeps track of multiple such data frames
and manages probe sample lifetimes across page navigations.
The probe manager updates probe model objects whenever breakpoints
are added, removed, or modified.
The inspector frontend now assigns breakpoint action identifiers,
rather than the backend. This lets ProbeObjects keep stable
identifiers that match the probe's samples, even when the underlying
breakpoint is re-added with a different identifier (such as when
editing probe expressions).
* UserInterface/Breakpoint.js:
(WebInspector.Breakpoint.prototype.get probeActions): Added.
(WebInspector.Breakpoint.prototype.createAction):
(WebInspector.Breakpoint.prototype.removeAction):
(WebInspector.Breakpoint.prototype.clearActions): Added.
* UserInterface/BreakpointAction.js:
(WebInspector.BreakpointAction):
(WebInspector.BreakpointAction.prototype.get id):
(WebInspector.BreakpointAction.prototype.get info):
* UserInterface/DebuggerManager.js:
(WebInspector.DebuggerManager.restoreBreakpointsSoon):
(WebInspector.DebuggerManager): Restore saved breakpoints
from cookies on the second run loop, so that all managers will
be able to received breakpoint added events.
(WebInspector.DebuggerManager.prototype.addBreakpoint):
(WebInspector.DebuggerManager.prototype.removeBreakpoint):
(WebInspector.DebuggerManager.prototype.get nextBreakpointActionIdentifier):
The debugger manager assigns unique breakpoint action identifiers with this getter.
(WebInspector.DebuggerManager.prototype._debuggerBreakpointActionType):
(WebInspector.DebuggerManager.prototype.didSetBreakpoint):
(WebInspector.DebuggerManager.prototype._setBreakpoint):
(WebInspector.DebuggerManager.prototype.didRemoveBreakpoint):
(WebInspector.DebuggerManager.prototype._removeBreakpoint):
* UserInterface/DebuggerObserver.js:
(WebInspector.DebuggerObserver.prototype.didSampleProbe):
* UserInterface/InspectorJSBackendCommands.js:
* UserInterface/Main.html:
* UserInterface/Main.js:
(WebInspector.loaded):
* UserInterface/Probe.js: Added.
(WebInspector.ProbeSample):
(WebInspector.Probe):
(WebInspector.Probe.prototype.get id):
(WebInspector.Probe.prototype.get breakpoint):
(WebInspector.Probe.prototype.get expression):
(WebInspector.Probe.prototype.set expression):
(WebInspector.Probe.prototype.get samples):
(WebInspector.Probe.prototype.clearSamples):
(WebInspector.Probe.prototype.addSample):
* UserInterface/ProbeManager.js: Added.
(WebInspector.ProbeManager):
(WebInspector.ProbeManager.prototype.probeSetForBreakpoint):
(WebInspector.ProbeManager.prototype._breakpointRemoved):
(WebInspector.ProbeManager.prototype._breakpointActionsChanged.get var):
(WebInspector.ProbeManager.prototype._breakpointActionsChanged.set get knownProbeIdentifiers):
(WebInspector.ProbeManager.prototype._breakpointActionsChanged):
* UserInterface/ProbeSet.js: Added.
(WebInspector.ProbeSet):
(WebInspector.ProbeSet.prototype.get breakpoint):
(WebInspector.ProbeSet.prototype.get probes):
(WebInspector.ProbeSet.prototype.get dataTable):
(WebInspector.ProbeSet.prototype.clear):
(WebInspector.ProbeSet.prototype.clearSamples):
(WebInspector.ProbeSet.prototype.createProbe):
(WebInspector.ProbeSet.prototype.removeProbe):
(WebInspector.ProbeSet.prototype.willRemove):
(WebInspector.ProbeSet.prototype._mainResourceChanged):
(WebInspector.ProbeSet.prototype._createDataTable):
(WebInspector.ProbeSet.prototype._sampleCollected):
(WebInspector.ProbeSet.prototype._breakpointResolvedStateDidChange):
* UserInterface/ProbeSetDataFrame.js: Added.
(WebInspector.ProbeSetDataFrame):
(WebInspector.ProbeSetDataFrame.compare):
(WebInspector.ProbeSetDataFrame.prototype.get key):
(WebInspector.ProbeSetDataFrame.prototype.get count):
(WebInspector.ProbeSetDataFrame.prototype.get index):
(WebInspector.ProbeSetDataFrame.prototype.get isSeparator):
(WebInspector.ProbeSetDataFrame.prototype.set isSeparator):
(WebInspector.ProbeSetDataFrame.prototype.addSampleForProbe):
(WebInspector.ProbeSetDataFrame.prototype.missingKeys):
(WebInspector.ProbeSetDataFrame.prototype.isComplete):
(WebInspector.ProbeSetDataFrame.prototype.fillMissingValues):
* UserInterface/ProbeSetDataTable.js: Added.
(WebInspector.ProbeSetDataTable):
(WebInspector.ProbeSetDataTable.prototype.get frames):
(WebInspector.ProbeSetDataTable.prototype.get separators):
(WebInspector.ProbeSetDataTable.prototype.willRemove):
(WebInspector.ProbeSetDataTable.prototype.mainResourceChanged):
(WebInspector.ProbeSetDataTable.prototype.addSampleForProbe):
(WebInspector.ProbeSetDataTable.prototype.addProbe):
(WebInspector.ProbeSetDataTable.prototype.removeProbe):
(WebInspector.ProbeSetDataTable.prototype.createFrame):
(WebInspector.ProbeSetDataTable.prototype.addFrame):
(WebInspector.ProbeSetDataTable.prototype.addSeparator):
LayoutTests:
Set up the debugger and probe managers when testing models.
Add a workalike for InspectorBackend.dumpInspectorProtocolMessages to
InspectorTest.
Add listeners for breakpoints and probes that produce
useful, deterministic trace output. Use the tracing in a new test.
* http/tests/inspector-protocol/resources/InspectorTest.js:
(InspectorTest.sendCommand):
(InspectorTest.initializeInspectorModels.console.assert):
(InspectorTest.initializeInspectorModels):
* inspector-protocol/debugger/didSampleProbe-multiple-probes-expected.txt:
* inspector-protocol/debugger/didSampleProbe-multiple-probes.html:
* inspector-protocol/model/probe-manager-add-remove-actions-expected.txt: Added.
* inspector-protocol/model/probe-manager-add-remove-actions.html: Added.
* inspector-protocol/resources/probe-helper.js:
(ProbeHelper.stringifyProbeSample):
(ProbeHelper.installTracingListeners.WebInspector):
(ProbeHelper.installTracingListeners):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorprotocolresourcesInspectorTestjs">trunk/LayoutTests/http/tests/inspector-protocol/resources/InspectorTest.js</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocoldebuggerdidSampleProbemultipleprobesexpectedtxt">trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocoldebuggerdidSampleProbemultipleprobeshtml">trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes.html</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolresourcesprobehelperjs">trunk/LayoutTests/inspector-protocol/resources/probe-helper.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugListenerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServercpp">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptDebugServerh">trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolDebuggerjson">trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBreakpointjs">trunk/Source/WebInspectorUI/UserInterface/Breakpoint.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBreakpointActionjs">trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceDebuggerObserverjs">trunk/Source/WebInspectorUI/UserInterface/DebuggerObserver.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceInspectorJSBackendCommandsjs">trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainjs">trunk/Source/WebInspectorUI/UserInterface/Main.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorprotocolmodelprobemanageraddremoveactionsexpectedtxt">trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorprotocolmodelprobemanageraddremoveactionshtml">trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProbejs">trunk/Source/WebInspectorUI/UserInterface/Probe.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProbeManagerjs">trunk/Source/WebInspectorUI/UserInterface/ProbeManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProbeSetjs">trunk/Source/WebInspectorUI/UserInterface/ProbeSet.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProbeSetDataFramejs">trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataFrame.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProbeSetDataTablejs">trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataTable.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/LayoutTests/ChangeLog 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-02-05 Brian Burg <bburg@apple.com>
+
+ Web Inspector: add probe manager and model objects to the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=127117
+
+ Reviewed by Timothy Hatcher.
+
+ Set up the debugger and probe managers when testing models.
+
+ Add a workalike for InspectorBackend.dumpInspectorProtocolMessages to
+ InspectorTest.
+
+ Add listeners for breakpoints and probes that produce
+ useful, deterministic trace output. Use the tracing in a new test.
+
+ * http/tests/inspector-protocol/resources/InspectorTest.js:
+ (InspectorTest.sendCommand):
+ (InspectorTest.initializeInspectorModels.console.assert):
+ (InspectorTest.initializeInspectorModels):
+ * inspector-protocol/debugger/didSampleProbe-multiple-probes-expected.txt:
+ * inspector-protocol/debugger/didSampleProbe-multiple-probes.html:
+ * inspector-protocol/model/probe-manager-add-remove-actions-expected.txt: Added.
+ * inspector-protocol/model/probe-manager-add-remove-actions.html: Added.
+ * inspector-protocol/resources/probe-helper.js:
+ (ProbeHelper.stringifyProbeSample):
+ (ProbeHelper.installTracingListeners.WebInspector):
+ (ProbeHelper.installTracingListeners):
+
</ins><span class="cx"> 2014-02-05 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> ElementRuleCollector should not use StyleResolver::State
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorprotocolresourcesInspectorTestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector-protocol/resources/InspectorTest.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector-protocol/resources/InspectorTest.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/LayoutTests/http/tests/inspector-protocol/resources/InspectorTest.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> InspectorFrontendAPI = {};
</span><span class="cx">
</span><span class="cx"> InspectorTest = {};
</span><ins>+InspectorTest.dumpInspectorProtocolMessages = false;
</ins><span class="cx"> InspectorTest._dispatchTable = [];
</span><span class="cx"> InspectorTest._requestId = -1;
</span><span class="cx"> InspectorTest.eventHandler = {};
</span><span class="lines">@@ -43,6 +44,11 @@
</span><span class="cx"> "params": params,
</span><span class="cx"> "id": this._requestId };
</span><span class="cx">
</span><ins>+ // This matches the debug dumping in InspectorBackend, which is bypassed
+ // by InspectorTest. Return messages should be dumped by InspectorBackend.
+ if (this.dumpInspectorProtocolMessages)
+ console.log("frontend: " + JSON.stringify(messageObject));
+
</ins><span class="cx"> InspectorFrontendHost.sendMessageToBackend(JSON.stringify(messageObject));
</span><span class="cx">
</span><span class="cx"> return this._requestId;
</span><span class="lines">@@ -165,8 +171,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (assertion)
</span><span class="cx"> return;
</span><ins>+
+ InspectorTest.log("ASSERT:" + message);
</ins><span class="cx"> InspectorTest.completeTest();
</span><del>- InspectorTest.log("ASSERT:" + message);
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Note: This function overwrites the InspectorFrontendAPI, so there's currently no
</span><span class="lines">@@ -194,8 +201,12 @@
</span><span class="cx"> "Revision",
</span><span class="cx"> "SourceCodeRevision",
</span><span class="cx"> "SourceCode",
</span><ins>+ "SourceCodeLocation",
+ "Script",
+ "TextRange",
</ins><span class="cx"> "Resource",
</span><span class="cx"> "ResourceCollection",
</span><ins>+ "SourceMapResource",
</ins><span class="cx"> "DOMTreeManager",
</span><span class="cx"> "DOMNode",
</span><span class="cx"> "ContentFlow",
</span><span class="lines">@@ -206,7 +217,17 @@
</span><span class="cx"> "CSSStyleManager",
</span><span class="cx"> "Color",
</span><span class="cx"> "RuntimeObserver",
</span><del>- "RuntimeManager"
</del><ins>+ "RuntimeManager",
+ "DebuggerObserver",
+ "DebuggerManager",
+ "BreakpointAction",
+ "Breakpoint",
+ "Probe",
+ "ProbeSet",
+ "ProbeManager",
+ "ProbeSetDataFrame",
+ "ProbeSetDataTable",
+ "RemoteObject"
</ins><span class="cx"> ];
</span><span class="cx">
</span><span class="cx"> // This corresponds to loading the scripts in Main.hml.
</span><span class="lines">@@ -225,6 +246,7 @@
</span><span class="cx"> InspectorBackend.registerInspectorDispatcher(new WebInspector.InspectorObserver);
</span><span class="cx"> InspectorBackend.registerPageDispatcher(new WebInspector.PageObserver);
</span><span class="cx"> InspectorBackend.registerDOMDispatcher(new WebInspector.DOMObserver);
</span><ins>+ InspectorBackend.registerDebuggerDispatcher(new WebInspector.DebuggerObserver);
</ins><span class="cx"> InspectorBackend.registerCSSDispatcher(new WebInspector.CSSObserver);
</span><span class="cx"> if (InspectorBackend.registerRuntimeDispatcher)
</span><span class="cx"> InspectorBackend.registerRuntimeDispatcher(new WebInspector.RuntimeObserver);
</span><span class="lines">@@ -232,7 +254,9 @@
</span><span class="cx"> WebInspector.frameResourceManager = new WebInspector.FrameResourceManager;
</span><span class="cx"> WebInspector.domTreeManager = new WebInspector.DOMTreeManager;
</span><span class="cx"> WebInspector.cssStyleManager = new WebInspector.CSSStyleManager;
</span><ins>+ WebInspector.debuggerManager = new WebInspector.DebuggerManager;
</ins><span class="cx"> WebInspector.runtimeManager = new WebInspector.RuntimeManager;
</span><ins>+ WebInspector.probeManager = new WebInspector.ProbeManager;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldebuggerdidSampleProbemultipleprobesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes-expected.txt (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes-expected.txt 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes-expected.txt 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -1,11 +1,10 @@
</span><span class="cx"> Debugger.setBreakpoint with multiple probe actions at the same breakpoint. Test Debugger.didSampleProbe events for the probe samples.
</span><span class="cx">
</span><span class="cx"> Found breakpoint.js
</span><del>-PASS: Should receive two breakpoint action identifiers on Debugger.setBreakpoint callback.
</del><span class="cx"> Running breakpointActions to trigger probe samples.
</span><span class="cx"> inside breakpointActions a:(12) b:([object Object])
</span><span class="cx"> Received probe sample payload: {"type":"number","value":12,"description":"12"}
</span><span class="cx"> Received probe sample payload: {"type":"number","value":12,"description":"12"}
</span><del>-PASS: Samples from probe actions on the same breakpoint should have unique action identifiers.
</del><ins>+PASS: Samples from different probe actions should have unique action identifiers.
</ins><span class="cx"> PASS: Samples from probe actions on the same breakpoint should have the same batch identifiers.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocoldebuggerdidSampleProbemultipleprobeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes.html (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes.html 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/LayoutTests/inspector-protocol/debugger/didSampleProbe-multiple-probes.html 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> var tests = [
</span><span class="cx"> {
</span><del>- message: "Samples from probe actions on the same breakpoint should have unique action identifiers.",
</del><ins>+ message: "Samples from different probe actions should have unique action identifiers.",
</ins><span class="cx"> predicate: function samplesHaveUniqueActionIds() {
</span><span class="cx"> return samples[0].probeId !== samples[1].probeId;
</span><span class="cx"> },
</span><span class="lines">@@ -48,22 +48,14 @@
</span><span class="cx"> var options = {
</span><span class="cx"> autoContinue: true,
</span><span class="cx"> actions: [
</span><del>- {"type": "probe", "data": "a"},
- {"type": "probe", "data": "a"}
</del><ins>+ {"type": "probe", "data": "a", "id": 1},
+ {"type": "probe", "data": "a", "id": 2}
</ins><span class="cx"> ]
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> InspectorTest.sendCommand("Debugger.setBreakpoint", {location: location, options: options}, function(responseObject) {
</span><span class="cx"> InspectorTest.checkForError(responseObject);
</span><del>- var actionIdentifiers = responseObject.result.breakpointActionIdentifiers;
- InspectorTest.assert(actionIdentifiers instanceof Array && actionIdentifiers.length === 2,
- "Should receive two breakpoint action identifiers on Debugger.setBreakpoint callback.");
</del><span class="cx">
</span><del>- // FIXME: should we use the Breakpoint/BreakpointAction model objects to manage this?
- if (actionIdentifiers.length === 2) {
- options.actions[0].identifier = actionIdentifiers[0];
- options.actions[1].identifier = actionIdentifiers[1];
- }
</del><span class="cx"> InspectorTest.log("Running breakpointActions to trigger probe samples.");
</span><span class="cx"> InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolmodelprobemanageraddremoveactionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions-expected.txt (0 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions-expected.txt 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Testing that the probe manager properly handles addition and removal of related probes.
+
+Breakpoint autocontinue state changed: true
+Probe set was added. New count: 1
+Probe with identifier 1 was added to probe set.
+Probe set's probe count: 1
+Breakpoint actions changed. New count: 1
+Probe with identifier 2 was added to probe set.
+Probe set's probe count: 2
+Breakpoint actions changed. New count: 2
+Breakpoint was added.
+PASS: Breakpoint should be resolved.
+inside breakpointActions a:(12) b:([object Object])
+Breakpoint resolved state changed: true
+Hit test checkpoint event #0 with type: probe-object-sample-added
+Probe with identifier 1 added sample: [object Object]
+Hit test checkpoint event #1 with type: probe-object-sample-added
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolmodelprobemanageraddremoveactionshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions.html (0 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions.html (rev 0)
+++ trunk/LayoutTests/inspector-protocol/model/probe-manager-add-remove-actions.html 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script type="text/javascript" src="../../http/tests/inspector-protocol/resources/protocol-test.js"></script>
+<script src="../debugger/resources/breakpoint.js"></script>
+<script>
+function test()
+{
+ InspectorTest.importScript("../../../../inspector-protocol/resources/probe-helper.js");
+ InspectorTest.initializeInspectorModels();
+
+ var currentTicks = 0;
+ const expectedTicks = 2;
+
+ function incrementTick(event)
+ {
+ InspectorTest.log("Hit test checkpoint event #" + currentTicks + " with type: " + event.type);
+ if (++currentTicks === expectedTicks)
+ InspectorTest.completeTest();
+ }
+
+ WebInspector.Probe.addEventListener(WebInspector.Probe.Event.SampleAdded, incrementTick);
+
+ ProbeHelper.installTracingListeners();
+
+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ScriptAdded, function(event) {
+
+ var scriptObject = event.data.script;
+
+ if (!/resources\/breakpoint\.js$/.test(scriptObject.url))
+ return;
+
+ var location = scriptObject.createSourceCodeLocation(18, 0);
+ // For this test, first create the breakpoint and its actions before sending anything to the backend.
+ var breakpoint = new WebInspector.Breakpoint(location);
+ breakpoint.autoContinue = true;
+ // Create two related actions.
+ for (var i of [0, 1])
+ var action = breakpoint.createAction(WebInspector.BreakpointAction.Type.Probe, null, "a");
+
+ WebInspector.debuggerManager.addBreakpoint(breakpoint);
+
+ breakpoint.addEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, function() {
+ InspectorTest.assert(breakpoint.resolved, "Breakpoint should be resolved.");
+ InspectorTest.sendCommand("Runtime.evaluate", {expression: "breakpointActions(12, {x:1,y:2})"});
+ });
+ });
+}
+</script>
+</head>
+<body onload="runTest()">
+ <p>Testing that the probe manager properly handles addition and removal of related probes.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorprotocolresourcesprobehelperjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector-protocol/resources/probe-helper.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector-protocol/resources/probe-helper.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/LayoutTests/inspector-protocol/resources/probe-helper.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -10,3 +10,118 @@
</span><span class="cx"> payload: data.payload
</span><span class="cx"> };
</span><span class="cx"> }
</span><ins>+
+ProbeHelper.stringifyProbeSample = function(ProbeSample)
+{
+ console.assert(ProbeSample instanceof WebInspector.ProbeSample, "Unexpected object type!");
+ return JSON.stringify({
+ "sampleId": ProbeSample.sampleId,
+ "batchId": ProbeSample.batchId,
+ });
+}
+
+ProbeHelper.installTracingListeners = function()
+{
+ if (!WebInspector.debuggerManager || !WebInspector.probeManager)
+ return;
+
+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointAdded, function(event) {
+ InspectorTest.log("Breakpoint was added.");
+ });
+
+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointRemoved, function(event) {
+ InspectorTest.log("Breakpoint was removed.");
+ });
+
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.DisabledStateDidChange, function(event) {
+ var breakpoint = event.target;
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unexpected object type!");
+
+ InspectorTest.log("Breakpoint disabled state changed: " + breakpoint.disabled);
+ });
+
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, function(event) {
+ var breakpoint = event.target;
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unexpected object type!");
+
+ InspectorTest.log("Breakpoint resolved state changed: " + breakpoint.resolved);
+ });
+
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.AutoContinueDidChange, function(event) {
+ var breakpoint = event.target;
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unexpected object type!");
+
+ InspectorTest.log("Breakpoint autocontinue state changed: " + breakpoint.autoContinue);
+ });
+
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ConditionDidChange, function(event) {
+ var breakpoint = event.target;
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unexpected object type!");
+
+ InspectorTest.log("Breakpoint condition changed: " + breakpoint.condition);
+ });
+
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ActionsDidChange, function(event) {
+ var breakpoint = event.target;
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unexpected object type!");
+
+ InspectorTest.log("Breakpoint actions changed. New count: " + breakpoint.actions.length);
+ });
+
+ WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetAdded, function(event) {
+ var probeSet = event.data;
+ console.assert(probeSet instanceof WebInspector.ProbeSet, "Unexpected object type!");
+
+ InspectorTest.log("Probe set was added. New count: " + WebInspector.probeManager.probeSets.length);
+ });
+
+ WebInspector.probeManager.addEventListener(WebInspector.ProbeManager.Event.ProbeSetRemoved, function(event) {
+ var probeSet = event.data;
+ console.assert(probeSet instanceof WebInspector.ProbeSet, "Unexpected object type!");
+
+ InspectorTest.log("Probe set was removed. New count: " + WebInspector.probeManager.probeSets.length);
+ });
+
+ WebInspector.Probe.addEventListener(WebInspector.Probe.Event.ExpressionChanged, function(event) {
+ var probe = event.target;
+ console.assert(probe instanceof WebInspector.Probe, "Unexpected object type!");
+
+ InspectorTest.log("Probe with identifier " + probe.id + " changed expression: " + probe.expression);
+ });
+
+ WebInspector.Probe.addEventListener(WebInspector.Probe.Event.SampleAdded, function(event) {
+ var probe = event.target;
+ var sample = event.data;
+ console.assert(probe instanceof WebInspector.Probe, "Unexpected object type!");
+ console.assert(sample instanceof WebInspector.ProbeSample, "Unexpected object type!");
+
+ InspectorTest.log("Probe with identifier " + probe.id + " added sample: " + sample);
+ });
+
+ WebInspector.Probe.addEventListener(WebInspector.Probe.Event.SamplesCleared, function(event) {
+ var probe = event.target;
+ console.assert(probe instanceof WebInspector.Probe, "Unexpected object type!");
+
+ InspectorTest.log("Probe with identifier " + probe.id + " cleared all samples.");
+ });
+
+ WebInspector.ProbeSet.addEventListener(WebInspector.ProbeSet.Event.ProbeAdded, function(event) {
+ var probe = event.data;
+ var probeSet = event.target;
+ console.assert(probe instanceof WebInspector.Probe, "Unexpected object type!");
+ console.assert(probeSet instanceof WebInspector.ProbeSet, "Unexpected object type!");
+
+ InspectorTest.log("Probe with identifier " + probe.id + " was added to probe set.");
+ InspectorTest.log("Probe set's probe count: " + probeSet.probes.length);
+ });
+
+ WebInspector.ProbeSet.addEventListener(WebInspector.ProbeSet.Event.ProbeRemoved, function(event) {
+ var probe = event.data;
+ var probeSet = event.target;
+ console.assert(probe instanceof WebInspector.Probe, "Unexpected object type!");
+ console.assert(probeSet instanceof WebInspector.ProbeSet, "Unexpected object type!");
+
+ InspectorTest.log("Probe with identifier " + probe.id + " was removed from probe set.");
+ InspectorTest.log("Probe set's probe count: " + probeSet.probes.length);
+ });
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-02-05 Brian Burg <bburg@apple.com>
+
+ Web Inspector: add probe manager and model objects to the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=127117
+
+ Reviewed by Timothy Hatcher.
+
+ The inspector frontend now assigns breakpoint action identifiers,
+ rather than the backend. Remove return values containing breakpoint
+ identifiers, and remove tracking and assignment of action identifiers.
+
+ * inspector/ScriptDebugListener.h:
+ * inspector/ScriptDebugServer.cpp:
+ (Inspector::ScriptDebugServer::evaluateBreakpointAction):
+ (Inspector::ScriptDebugServer::dispatchBreakpointActionProbe):
+ Pass BreakpointAction by reference rather than just the action identifier.
+
+ * inspector/ScriptDebugServer.h:
+ * inspector/agents/InspectorDebuggerAgent.cpp:
+ (Inspector::objectGroupForBreakpointAction):
+ (Inspector::InspectorDebuggerAgent::InspectorDebuggerAgent):
+ (Inspector::InspectorDebuggerAgent::breakpointActionsFromProtocol):
+ (Inspector::InspectorDebuggerAgent::setBreakpointByUrl):
+ (Inspector::InspectorDebuggerAgent::setBreakpoint):
+ (Inspector::InspectorDebuggerAgent::removeBreakpoint):
+ (Inspector::InspectorDebuggerAgent::breakpointActionProbe):
+ * inspector/agents/InspectorDebuggerAgent.h:
+ * inspector/protocol/Debugger.json: Revert change to setBreakpoint return values. Add optional identifier to breakpoint actions.
+
</ins><span class="cx"> 2014-02-05 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> JSC on Mac should pull LLVM from prefix=/usr/local/LLVMForJavaScriptCore and not /usr/local
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugListener.h 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -69,11 +69,11 @@
</span><span class="cx"> virtual void didParseSource(JSC::SourceID, const Script&) = 0;
</span><span class="cx"> virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) = 0;
</span><span class="cx"> virtual void didPause(JSC::ExecState*, const Deprecated::ScriptValue& callFrames, const Deprecated::ScriptValue& exception) = 0;
</span><del>- virtual void didSampleProbe(JSC::ExecState*, int probeIdentifier, int hitCount, const Deprecated::ScriptValue& result) = 0;
</del><span class="cx"> virtual void didContinue() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void breakpointActionLog(JSC::ExecState*, const String&) = 0;
</span><span class="cx"> virtual void breakpointActionSound(int breakpointActionIdentifier) = 0;
</span><ins>+ virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, int hitCount, const Deprecated::ScriptValue& result) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.cpp 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> JSC::ExecState* state = debuggerCallFrame->scope()->globalObject()->globalExec();
</span><span class="cx"> Deprecated::ScriptValue wrappedResult = Deprecated::ScriptValue(state->vm(), exception ? exception : result);
</span><del>- dispatchDidSampleProbe(state, breakpointAction.identifier, wrappedResult);
</del><ins>+ dispatchBreakpointActionProbe(state, breakpointAction, wrappedResult);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> listener->breakpointActionSound(breakpointActionIdentifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScriptDebugServer::dispatchDidSampleProbe(ExecState* exec, int identifier, const Deprecated::ScriptValue& sample)
</del><ins>+void ScriptDebugServer::dispatchBreakpointActionProbe(ExecState* exec, const ScriptBreakpointAction& action, const Deprecated::ScriptValue& sample)
</ins><span class="cx"> {
</span><span class="cx"> if (m_callingListeners)
</span><span class="cx"> return;
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> Vector<ScriptDebugListener*> listenersCopy;
</span><span class="cx"> copyToVector(*listeners, listenersCopy);
</span><span class="cx"> for (auto listener : listenersCopy)
</span><del>- listener->didSampleProbe(exec, identifier, m_hitCount, sample);
</del><ins>+ listener->breakpointActionProbe(exec, action, m_hitCount, sample);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScriptDebugServer::dispatchDidContinue(ScriptDebugListener* listener)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptDebugServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> void dispatchFailedToParseSource(const ListenerSet& listeners, JSC::SourceProvider*, int errorLine, const String& errorMessage);
</span><span class="cx"> void dispatchBreakpointActionLog(JSC::ExecState*, const String&);
</span><span class="cx"> void dispatchBreakpointActionSound(JSC::ExecState*, int breakpointActionIdentifier);
</span><del>- void dispatchDidSampleProbe(JSC::ExecState*, int probeIdentifier, const Deprecated::ScriptValue& sample);
</del><ins>+ void dispatchBreakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, const Deprecated::ScriptValue& sample);
</ins><span class="cx">
</span><span class="cx"> bool m_doneProcessingDebuggerEvents;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -46,10 +46,14 @@
</span><span class="cx">
</span><span class="cx"> const char* InspectorDebuggerAgent::backtraceObjectGroup = "backtrace";
</span><span class="cx">
</span><del>-static String objectGroupForBreakpointAction(int identifier)
</del><ins>+// Objects created and retained by evaluating breakpoint actions are put into object groups
+// according to the breakpoint action identifier assigned by the frontend. A breakpoint may
+// have several object groups, and objects from several backend breakpoint action instances may
+// create objects in the same group.
+static String objectGroupForBreakpointAction(const ScriptBreakpointAction& action)
</ins><span class="cx"> {
</span><span class="cx"> DEFINE_STATIC_LOCAL(const AtomicString, objectGroup, ("breakpoint-action-", AtomicString::ConstructFromLiteral));
</span><del>- return makeString(objectGroup, String::number(identifier));
</del><ins>+ return makeString(objectGroup, String::number(action.identifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorDebuggerAgent::InspectorDebuggerAgent(InjectedScriptManager* injectedScriptManager)
</span><span class="lines">@@ -61,7 +65,6 @@
</span><span class="cx"> , m_enabled(false)
</span><span class="cx"> , m_javaScriptPauseScheduled(false)
</span><span class="cx"> , m_nextProbeSampleId(1)
</span><del>- , m_nextBreakpointActionIdentifier(1)
</del><span class="cx"> {
</span><span class="cx"> // FIXME: make breakReason optional so that there was no need to init it with "other".
</span><span class="cx"> clearBreakDetails();
</span><span class="lines">@@ -222,16 +225,21 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Specifying an identifier is optional. They are used to correlate probe samples
+ // in the frontend across multiple backend probe actions and segregate object groups.
+ int identifier = 0;
+ object->getNumber(ASCIILiteral("id"), &identifier);
+
</ins><span class="cx"> String data;
</span><span class="cx"> object->getString(ASCIILiteral("data"), &data);
</span><span class="cx">
</span><del>- result->append(ScriptBreakpointAction(type, m_nextBreakpointActionIdentifier++, data));
</del><ins>+ result->append(ScriptBreakpointAction(type, identifier, data));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers)
</del><ins>+void InspectorDebuggerAgent::setBreakpointByUrl(ErrorString* errorString, int lineNumber, const String* const optionalURL, const String* const optionalURLRegex, const int* const optionalColumnNumber, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations)
</ins><span class="cx"> {
</span><span class="cx"> locations = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>::create();
</span><span class="cx"> if (!optionalURL == !optionalURLRegex) {
</span><span class="lines">@@ -262,10 +270,6 @@
</span><span class="cx"> if (!breakpointActionsFromProtocol(errorString, actions, &breakpointActions))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- breakpointActionIdentifiers = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>::create();
- for (ScriptBreakpointAction& action : breakpointActions)
- breakpointActionIdentifiers->addItem(action.identifier);
-
</del><span class="cx"> m_javaScriptBreakpoints.set(breakpointIdentifier, buildObjectForBreakpointCookie(url, lineNumber, columnNumber, condition, actions, isRegex, autoContinue));
</span><span class="cx">
</span><span class="cx"> ScriptBreakpoint breakpoint(lineNumber, columnNumber, condition, breakpointActions, autoContinue);
</span><span class="lines">@@ -296,7 +300,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers)
</del><ins>+void InspectorDebuggerAgent::setBreakpoint(ErrorString* errorString, const RefPtr<InspectorObject>& location, const RefPtr<InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId* outBreakpointIdentifier, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation)
</ins><span class="cx"> {
</span><span class="cx"> JSC::SourceID sourceID;
</span><span class="cx"> unsigned lineNumber;
</span><span class="lines">@@ -317,10 +321,6 @@
</span><span class="cx"> if (!breakpointActionsFromProtocol(errorString, actions, &breakpointActions))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- breakpointActionIdentifiers = Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>::create();
- for (ScriptBreakpointAction& action : breakpointActions)
- breakpointActionIdentifiers->addItem(action.identifier);
-
</del><span class="cx"> String breakpointIdentifier = String::number(sourceID) + ':' + String::number(lineNumber) + ':' + String::number(columnNumber);
</span><span class="cx"> if (m_breakpointIdentifierToDebugServerBreakpointIDs.find(breakpointIdentifier) != m_breakpointIdentifierToDebugServerBreakpointIDs.end()) {
</span><span class="cx"> *errorString = ASCIILiteral("Breakpoint at specified location already exists.");
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> for (auto breakpointID : breakpointIDs) {
</span><span class="cx"> const Vector<ScriptBreakpointAction>& breakpointActions = scriptDebugServer().getActionsForBreakpoint(breakpointID);
</span><span class="cx"> for (auto& action : breakpointActions)
</span><del>- m_injectedScriptManager->releaseObjectGroup(objectGroupForBreakpointAction(action.identifier));
</del><ins>+ m_injectedScriptManager->releaseObjectGroup(objectGroupForBreakpointAction(action));
</ins><span class="cx">
</span><span class="cx"> scriptDebugServer().removeBreakpoint(breakpointID);
</span><span class="cx"> }
</span><span class="lines">@@ -649,14 +649,19 @@
</span><span class="cx"> m_listener->didPause();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::didSampleProbe(JSC::ExecState* scriptState, int probeIdentifier, int hitCount, const Deprecated::ScriptValue& sample)
</del><ins>+void InspectorDebuggerAgent::breakpointActionSound(int breakpointActionIdentifier)
</ins><span class="cx"> {
</span><ins>+ m_frontendDispatcher->playBreakpointActionSound(breakpointActionIdentifier);
+}
+
+void InspectorDebuggerAgent::breakpointActionProbe(JSC::ExecState* scriptState, const ScriptBreakpointAction& action, int hitCount, const Deprecated::ScriptValue& sample)
+{
</ins><span class="cx"> int sampleId = m_nextProbeSampleId++;
</span><span class="cx">
</span><span class="cx"> InjectedScript injectedScript = m_injectedScriptManager->injectedScriptFor(scriptState);
</span><del>- RefPtr<TypeBuilder::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(probeIdentifier));
</del><ins>+ RefPtr<TypeBuilder::Runtime::RemoteObject> payload = injectedScript.wrapObject(sample, objectGroupForBreakpointAction(action));
</ins><span class="cx"> RefPtr<TypeBuilder::Debugger::ProbeSample> result = TypeBuilder::Debugger::ProbeSample::create()
</span><del>- .setProbeId(probeIdentifier)
</del><ins>+ .setProbeId(action.identifier)
</ins><span class="cx"> .setSampleId(sampleId)
</span><span class="cx"> .setBatchId(hitCount)
</span><span class="cx"> .setTimestamp(monotonicallyIncreasingTime())
</span><span class="lines">@@ -665,11 +670,6 @@
</span><span class="cx"> m_frontendDispatcher->didSampleProbe(result.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorDebuggerAgent::breakpointActionSound(int breakpointActionIdentifier)
-{
- m_frontendDispatcher->playBreakpointActionSound(breakpointActionIdentifier);
-}
-
</del><span class="cx"> void InspectorDebuggerAgent::didContinue()
</span><span class="cx"> {
</span><span class="cx"> m_pausedScriptState = nullptr;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorDebuggerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -71,8 +71,8 @@
</span><span class="cx"> virtual void enable(ErrorString*) override;
</span><span class="cx"> virtual void disable(ErrorString*) override;
</span><span class="cx"> virtual void setBreakpointsActive(ErrorString*, bool active) override;
</span><del>- virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers) override;
- virtual void setBreakpoint(ErrorString*, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::BreakpointActionIdentifier>>& breakpointActionIdentifiers) override;
</del><ins>+ virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::Debugger::Location>>& locations) override;
+ virtual void setBreakpoint(ErrorString*, const RefPtr<Inspector::InspectorObject>& location, const RefPtr<Inspector::InspectorObject>* options, Inspector::TypeBuilder::Debugger::BreakpointId*, RefPtr<Inspector::TypeBuilder::Debugger::Location>& actualLocation) override;
</ins><span class="cx"> virtual void removeBreakpoint(ErrorString*, const String& breakpointIdentifier) override;
</span><span class="cx"> virtual void continueToLocation(ErrorString*, const RefPtr<InspectorObject>& location) override;
</span><span class="cx"> virtual void searchInContent(ErrorString*, const String& scriptID, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<Inspector::TypeBuilder::Array<Inspector::TypeBuilder::GenericTypes::SearchMatch>>&) override;
</span><span class="lines">@@ -133,9 +133,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void didParseSource(JSC::SourceID, const Script&) override final;
</span><span class="cx"> virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) override final;
</span><del>- virtual void didSampleProbe(JSC::ExecState*, int probeIdentifier, int hitCount, const Deprecated::ScriptValue& sample) override final;
</del><span class="cx">
</span><span class="cx"> virtual void breakpointActionSound(int breakpointActionIdentifier) override;
</span><ins>+ virtual void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, int hitCount, const Deprecated::ScriptValue& sample) override final;
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<Inspector::TypeBuilder::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&);
</span><span class="cx"> bool assertPaused(ErrorString*);
</span><span class="lines">@@ -163,7 +163,6 @@
</span><span class="cx"> bool m_enabled;
</span><span class="cx"> bool m_javaScriptPauseScheduled;
</span><span class="cx"> int m_nextProbeSampleId;
</span><del>- int m_nextBreakpointActionIdentifier;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolDebuggerjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Debugger.json 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx"> "type": "object",
</span><span class="cx"> "properties": [
</span><span class="cx"> { "name": "type", "type": "string", "enum": ["log", "evaluate", "sound", "probe"], "description": "Different kinds of breakpoint actions." },
</span><del>- { "name": "data", "type": "string", "optional": true, "description": "Data associated with this breakpoint type (e.g. for type \"eval\" this is the JavaScript string to evalulate)." }
</del><ins>+ { "name": "data", "type": "string", "optional": true, "description": "Data associated with this breakpoint type (e.g. for type \"eval\" this is the JavaScript string to evalulate)." },
+ { "name": "id", "$ref": "BreakpointActionIdentifier", "optional": true, "description": "A frontend-assigned identifier for this breakpoint action." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Action to perform when a breakpoint is triggered."
</span><span class="cx"> },
</span><span class="lines">@@ -124,8 +125,7 @@
</span><span class="cx"> ],
</span><span class="cx"> "returns": [
</span><span class="cx"> { "name": "breakpointId", "$ref": "BreakpointId", "description": "Id of the created breakpoint for further reference." },
</span><del>- { "name": "locations", "type": "array", "items": { "$ref": "Location"}, "description": "List of the locations this breakpoint resolved into upon addition." },
- { "name": "breakpointActionIdentifiers", "type": "array", "items": { "$ref": "BreakpointActionIdentifier" }, "description": "Assigned breakpoint action identifiers." }
</del><ins>+ { "name": "locations", "type": "array", "items": { "$ref": "Location"}, "description": "List of the locations this breakpoint resolved into upon addition." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Sets JavaScript breakpoint at given location specified either by URL or URL regex. Once this command is issued, all existing parsed scripts will have breakpoints resolved and returned in <code>locations</code> property. Further matching script parsing will result in subsequent <code>breakpointResolved</code> events issued. This logical breakpoint will survive page reloads."
</span><span class="cx"> },
</span><span class="lines">@@ -137,8 +137,7 @@
</span><span class="cx"> ],
</span><span class="cx"> "returns": [
</span><span class="cx"> { "name": "breakpointId", "$ref": "BreakpointId", "description": "Id of the created breakpoint for further reference." },
</span><del>- { "name": "actualLocation", "$ref": "Location", "description": "Location this breakpoint resolved into." },
- { "name": "breakpointActionIdentifiers", "type": "array", "items": { "$ref": "BreakpointActionIdentifier" }, "description": "Assigned breakpoint action identifiers." }
</del><ins>+ { "name": "actualLocation", "$ref": "Location", "description": "Location this breakpoint resolved into." }
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Sets JavaScript breakpoint at a given location."
</span><span class="cx"> },
</span><span class="lines">@@ -295,7 +294,7 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "didSampleProbe",
</span><del>- "description": "Fires when a new proben sample is collected.",
</del><ins>+ "description": "Fires when a new probe sample is collected.",
</ins><span class="cx"> "parameters": [
</span><span class="cx"> { "name": "sample", "$ref": "ProbeSample", "description": "A collected probe sample." }
</span><span class="cx"> ]
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -1,3 +1,114 @@
</span><ins>+2014-02-05 Brian Burg <bburg@apple.com>
+
+ Web Inspector: add probe manager and model objects to the frontend
+ https://bugs.webkit.org/show_bug.cgi?id=127117
+
+ Reviewed by Timothy Hatcher.
+
+ Add the probe manager, and the following model objects:
+
+ - ProbeObject corresponds to a single probe breakpoint action.
+ - ProbeSetObject contains all ProbeObjects for one Breakpoint.
+ - ProbeSetDataFrame holds probe samples from multiple
+ probes fired from the same breakpoint hit/debugger pause.
+ - ProbeSetDataTable keeps track of multiple such data frames
+ and manages probe sample lifetimes across page navigations.
+
+ The probe manager updates probe model objects whenever breakpoints
+ are added, removed, or modified.
+
+ The inspector frontend now assigns breakpoint action identifiers,
+ rather than the backend. This lets ProbeObjects keep stable
+ identifiers that match the probe's samples, even when the underlying
+ breakpoint is re-added with a different identifier (such as when
+ editing probe expressions).
+
+ * UserInterface/Breakpoint.js:
+ (WebInspector.Breakpoint.prototype.get probeActions): Added.
+ (WebInspector.Breakpoint.prototype.createAction):
+ (WebInspector.Breakpoint.prototype.removeAction):
+ (WebInspector.Breakpoint.prototype.clearActions): Added.
+ * UserInterface/BreakpointAction.js:
+ (WebInspector.BreakpointAction):
+ (WebInspector.BreakpointAction.prototype.get id):
+ (WebInspector.BreakpointAction.prototype.get info):
+ * UserInterface/DebuggerManager.js:
+ (WebInspector.DebuggerManager.restoreBreakpointsSoon):
+ (WebInspector.DebuggerManager): Restore saved breakpoints
+ from cookies on the second run loop, so that all managers will
+ be able to received breakpoint added events.
+ (WebInspector.DebuggerManager.prototype.addBreakpoint):
+ (WebInspector.DebuggerManager.prototype.removeBreakpoint):
+ (WebInspector.DebuggerManager.prototype.get nextBreakpointActionIdentifier):
+ The debugger manager assigns unique breakpoint action identifiers with this getter.
+
+ (WebInspector.DebuggerManager.prototype._debuggerBreakpointActionType):
+ (WebInspector.DebuggerManager.prototype.didSetBreakpoint):
+ (WebInspector.DebuggerManager.prototype._setBreakpoint):
+ (WebInspector.DebuggerManager.prototype.didRemoveBreakpoint):
+ (WebInspector.DebuggerManager.prototype._removeBreakpoint):
+ * UserInterface/DebuggerObserver.js:
+ (WebInspector.DebuggerObserver.prototype.didSampleProbe):
+ * UserInterface/InspectorJSBackendCommands.js:
+ * UserInterface/Main.html:
+ * UserInterface/Main.js:
+ (WebInspector.loaded):
+ * UserInterface/Probe.js: Added.
+ (WebInspector.ProbeSample):
+ (WebInspector.Probe):
+ (WebInspector.Probe.prototype.get id):
+ (WebInspector.Probe.prototype.get breakpoint):
+ (WebInspector.Probe.prototype.get expression):
+ (WebInspector.Probe.prototype.set expression):
+ (WebInspector.Probe.prototype.get samples):
+ (WebInspector.Probe.prototype.clearSamples):
+ (WebInspector.Probe.prototype.addSample):
+ * UserInterface/ProbeManager.js: Added.
+ (WebInspector.ProbeManager):
+ (WebInspector.ProbeManager.prototype.probeSetForBreakpoint):
+ (WebInspector.ProbeManager.prototype._breakpointRemoved):
+ (WebInspector.ProbeManager.prototype._breakpointActionsChanged.get var):
+ (WebInspector.ProbeManager.prototype._breakpointActionsChanged.set get knownProbeIdentifiers):
+ (WebInspector.ProbeManager.prototype._breakpointActionsChanged):
+ * UserInterface/ProbeSet.js: Added.
+ (WebInspector.ProbeSet):
+ (WebInspector.ProbeSet.prototype.get breakpoint):
+ (WebInspector.ProbeSet.prototype.get probes):
+ (WebInspector.ProbeSet.prototype.get dataTable):
+ (WebInspector.ProbeSet.prototype.clear):
+ (WebInspector.ProbeSet.prototype.clearSamples):
+ (WebInspector.ProbeSet.prototype.createProbe):
+ (WebInspector.ProbeSet.prototype.removeProbe):
+ (WebInspector.ProbeSet.prototype.willRemove):
+ (WebInspector.ProbeSet.prototype._mainResourceChanged):
+ (WebInspector.ProbeSet.prototype._createDataTable):
+ (WebInspector.ProbeSet.prototype._sampleCollected):
+ (WebInspector.ProbeSet.prototype._breakpointResolvedStateDidChange):
+ * UserInterface/ProbeSetDataFrame.js: Added.
+ (WebInspector.ProbeSetDataFrame):
+ (WebInspector.ProbeSetDataFrame.compare):
+ (WebInspector.ProbeSetDataFrame.prototype.get key):
+ (WebInspector.ProbeSetDataFrame.prototype.get count):
+ (WebInspector.ProbeSetDataFrame.prototype.get index):
+ (WebInspector.ProbeSetDataFrame.prototype.get isSeparator):
+ (WebInspector.ProbeSetDataFrame.prototype.set isSeparator):
+ (WebInspector.ProbeSetDataFrame.prototype.addSampleForProbe):
+ (WebInspector.ProbeSetDataFrame.prototype.missingKeys):
+ (WebInspector.ProbeSetDataFrame.prototype.isComplete):
+ (WebInspector.ProbeSetDataFrame.prototype.fillMissingValues):
+ * UserInterface/ProbeSetDataTable.js: Added.
+ (WebInspector.ProbeSetDataTable):
+ (WebInspector.ProbeSetDataTable.prototype.get frames):
+ (WebInspector.ProbeSetDataTable.prototype.get separators):
+ (WebInspector.ProbeSetDataTable.prototype.willRemove):
+ (WebInspector.ProbeSetDataTable.prototype.mainResourceChanged):
+ (WebInspector.ProbeSetDataTable.prototype.addSampleForProbe):
+ (WebInspector.ProbeSetDataTable.prototype.addProbe):
+ (WebInspector.ProbeSetDataTable.prototype.removeProbe):
+ (WebInspector.ProbeSetDataTable.prototype.createFrame):
+ (WebInspector.ProbeSetDataTable.prototype.addFrame):
+ (WebInspector.ProbeSetDataTable.prototype.addSeparator):
+
</ins><span class="cx"> 2014-02-05 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Avoid no-op regenerations of GResourceBundle.xml, GResourceBundle.c
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBreakpointjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Breakpoint.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Breakpoint.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/UserInterface/Breakpoint.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -203,6 +203,13 @@
</span><span class="cx"> };
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get probeActions()
+ {
+ return this._actions.filter(function(action) {
+ return action.type === WebInspector.BreakpointAction.Type.Probe;
+ });
+ },
+
</ins><span class="cx"> cycleToNextMode: function()
</span><span class="cx"> {
</span><span class="cx"> if (this.disabled) {
</span><span class="lines">@@ -281,9 +288,9 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- createAction: function(type, precedingAction)
</del><ins>+ createAction: function(type, precedingAction, data)
</ins><span class="cx"> {
</span><del>- var newAction = new WebInspector.BreakpointAction(this, type, null);
</del><ins>+ var newAction = new WebInspector.BreakpointAction(this, type, data || null);
</ins><span class="cx">
</span><span class="cx"> if (!precedingAction)
</span><span class="cx"> this._actions.push(newAction);
</span><span class="lines">@@ -332,6 +339,16 @@
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ActionsDidChange);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ clearActions: function(type)
+ {
+ if (!type)
+ this._actions = [];
+ else
+ this._actions = this._actions.filter(function(action) { action.type != type; });
+
+ this.dispatchEventToListeners(WebInspector.Breakpoint.Event.ActionsDidChange);
+ },
+
</ins><span class="cx"> saveIdentityToCookie: function(cookie)
</span><span class="cx"> {
</span><span class="cx"> cookie[WebInspector.Breakpoint.URLCookieKey] = this.url;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBreakpointActionjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/UserInterface/BreakpointAction.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> console.error("Unexpected type passed to WebInspector.BreakpointAction");
</span><span class="cx">
</span><span class="cx"> console.assert(typeof this._type === "string");
</span><ins>+ this._id = WebInspector.debuggerManager.nextBreakpointActionIdentifier;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.BreakpointAction.Type = {
</span><span class="lines">@@ -53,6 +54,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.BreakpointAction.prototype = {
</span><span class="cx"> constructor: WebInspector.BreakpointAction,
</span><ins>+ __proto__: WebInspector.Object.prototype,
</ins><span class="cx">
</span><span class="cx"> // Public
</span><span class="cx">
</span><span class="lines">@@ -61,6 +63,11 @@
</span><span class="cx"> return this._breakpoint;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get id()
+ {
+ return this._id;
+ },
+
</ins><span class="cx"> get type()
</span><span class="cx"> {
</span><span class="cx"> return this._type;
</span><span class="lines">@@ -83,11 +90,9 @@
</span><span class="cx">
</span><span class="cx"> get info()
</span><span class="cx"> {
</span><del>- var obj = {type: this._type};
</del><ins>+ var obj = {type: this._type, id: this._id};
</ins><span class="cx"> if (this._data)
</span><span class="cx"> obj.data = this._data;
</span><span class="cx"> return obj;
</span><span class="cx"> }
</span><span class="cx"> };
</span><del>-
-WebInspector.BreakpointAction.prototype.__proto__ = WebInspector.Object.prototype;
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/DebuggerManager.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/DebuggerManager.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/UserInterface/DebuggerManager.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> this._breakpointScriptIdentifierMap = {};
</span><span class="cx"> this._breakpointIdMap = {};
</span><span class="cx">
</span><ins>+ this._nextBreakpointActionIdentifier = 1;
+
</ins><span class="cx"> this._scriptIdMap = {};
</span><span class="cx"> this._scriptURLMap = {};
</span><span class="cx">
</span><span class="lines">@@ -64,11 +66,14 @@
</span><span class="cx">
</span><span class="cx"> this._updateBreakOnExceptionsState();
</span><span class="cx">
</span><del>- var savedBreakpoints = this._breakpointsSetting.value;
- for (var i = 0; i < savedBreakpoints.length; ++i) {
- var breakpoint = new WebInspector.Breakpoint(savedBreakpoints[i]);
- this.addBreakpoint(breakpoint, true);
</del><ins>+ function restoreBreakpointsSoon() {
+ for (cookie of this._breakpointsSetting.value)
+ this.addBreakpoint(new WebInspector.Breakpoint(cookie));
</ins><span class="cx"> }
</span><ins>+
+ // Ensure that all managers learn about restored breakpoints,
+ // regardless of their initialization order.
+ setTimeout(restoreBreakpointsSoon.bind(this), 0);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DebuggerManager.Event = {
</span><span class="lines">@@ -221,7 +226,7 @@
</span><span class="cx">
</span><span class="cx"> addBreakpoint: function(breakpoint, skipEventDispatch)
</span><span class="cx"> {
</span><del>- console.assert(breakpoint);
</del><ins>+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Bad argument to DebuggerManger.addBreakpoint: ", breakpoint);
</ins><span class="cx"> if (!breakpoint)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -260,7 +265,7 @@
</span><span class="cx">
</span><span class="cx"> this._breakpoints.remove(breakpoint);
</span><span class="cx">
</span><del>- if (breakpoint.id)
</del><ins>+ if (breakpoint.identifier)
</ins><span class="cx"> this._removeBreakpoint(breakpoint);
</span><span class="cx">
</span><span class="cx"> if (breakpoint.url) {
</span><span class="lines">@@ -281,6 +286,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Disable the breakpoint first, so removing actions doesn't re-add the breakpoint.
+ breakpoint.disabled = true;
+ breakpoint.clearActions();
+
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.BreakpointRemoved, {breakpoint: breakpoint});
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -431,6 +440,11 @@
</span><span class="cx"> return this.isBreakpointRemovable(breakpoint);
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ get nextBreakpointActionIdentifier()
+ {
+ return this._nextBreakpointActionIdentifier++;
+ },
+
</ins><span class="cx"> // Private
</span><span class="cx">
</span><span class="cx"> _sourceCodeLocationFromPayload: function(payload)
</span><span class="lines">@@ -487,6 +501,8 @@
</span><span class="cx"> return DebuggerAgent.BreakpointActionType.Evaluate;
</span><span class="cx"> case WebInspector.BreakpointAction.Type.Sound:
</span><span class="cx"> return DebuggerAgent.BreakpointActionType.Sound;
</span><ins>+ case WebInspector.BreakpointAction.Type.Probe:
+ return DebuggerAgent.BreakpointActionType.Probe;
</ins><span class="cx"> default:
</span><span class="cx"> console.assert(false);
</span><span class="cx"> return DebuggerAgent.BreakpointActionType.Log;
</span><span class="lines">@@ -495,10 +511,10 @@
</span><span class="cx">
</span><span class="cx"> _setBreakpoint: function(breakpoint, callback)
</span><span class="cx"> {
</span><del>- console.assert(!breakpoint.id);
</del><ins>+ console.assert(!breakpoint.identifier);
</ins><span class="cx"> console.assert(!breakpoint.disabled);
</span><span class="cx">
</span><del>- if (breakpoint.id || breakpoint.disabled)
</del><ins>+ if (breakpoint.identifier || breakpoint.disabled)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> function didSetBreakpoint(error, breakpointIdentifier)
</span><span class="lines">@@ -508,7 +524,7 @@
</span><span class="cx">
</span><span class="cx"> this._breakpointIdMap[breakpointIdentifier] = breakpoint;
</span><span class="cx">
</span><del>- breakpoint.id = breakpointIdentifier;
</del><ins>+ breakpoint.identifier = breakpointIdentifier;
</ins><span class="cx"> breakpoint.resolved = true;
</span><span class="cx">
</span><span class="cx"> if (typeof callback === "function")
</span><span class="lines">@@ -552,9 +568,7 @@
</span><span class="cx">
</span><span class="cx"> _removeBreakpoint: function(breakpoint, callback)
</span><span class="cx"> {
</span><del>- console.assert(breakpoint.id);
-
- if (!breakpoint.id)
</del><ins>+ if (!breakpoint.identifier)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> function didRemoveBreakpoint(error)
</span><span class="lines">@@ -562,9 +576,9 @@
</span><span class="cx"> if (error)
</span><span class="cx"> console.error(error);
</span><span class="cx">
</span><del>- delete this._breakpointIdMap[breakpoint.id];
</del><ins>+ delete this._breakpointIdMap[breakpoint.identifier];
</ins><span class="cx">
</span><del>- breakpoint.id = null;
</del><ins>+ breakpoint.identifier = null;
</ins><span class="cx">
</span><span class="cx"> // Don't reset resolved here since we want to keep disabled breakpoints looking like they
</span><span class="cx"> // are resolved in the user interface. They will get marked as unresolved in reset.
</span><span class="lines">@@ -573,7 +587,7 @@
</span><span class="cx"> callback();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- DebuggerAgent.removeBreakpoint(breakpoint.id, didRemoveBreakpoint.bind(this));
</del><ins>+ DebuggerAgent.removeBreakpoint(breakpoint.identifier, didRemoveBreakpoint.bind(this));
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> _breakpointDisplayLocationDidChange: function(event)
</span><span class="lines">@@ -582,7 +596,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> var breakpoint = event.target;
</span><del>- if (!breakpoint.id || breakpoint.disabled)
</del><ins>+ if (!breakpoint.identifier || breakpoint.disabled)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Remove the breakpoint with its old id.
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceDebuggerObserverjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/DebuggerObserver.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/DebuggerObserver.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/UserInterface/DebuggerObserver.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -67,6 +67,11 @@
</span><span class="cx"> {
</span><span class="cx"> WebInspector.debuggerManager.playBreakpointActionSound(breakpointActionIdentifier);
</span><span class="cx"> },
</span><ins>+
+ didSampleProbe: function(sample)
+ {
+ WebInspector.probeManager.didSampleProbe(sample);
+ }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.DebuggerObserver.prototype.__proto__ = WebInspector.Object.prototype;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceInspectorJSBackendCommandsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx"> InspectorBackend.registerCommand("Debugger.enable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Debugger.disable", [], []);
</span><span class="cx"> InspectorBackend.registerCommand("Debugger.setBreakpointsActive", [{"name": "active", "type": "boolean", "optional": false}], []);
</span><del>-InspectorBackend.registerCommand("Debugger.setBreakpointByUrl", [{"name": "lineNumber", "type": "number", "optional": false}, {"name": "url", "type": "string", "optional": true}, {"name": "urlRegex", "type": "string", "optional": true}, {"name": "columnNumber", "type": "number", "optional": true}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "locations", "breakpointActionIdentifiers"]);
-InspectorBackend.registerCommand("Debugger.setBreakpoint", [{"name": "location", "type": "object", "optional": false}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "actualLocation", "breakpointActionIdentifiers"]);
</del><ins>+InspectorBackend.registerCommand("Debugger.setBreakpointByUrl", [{"name": "lineNumber", "type": "number", "optional": false}, {"name": "url", "type": "string", "optional": true}, {"name": "urlRegex", "type": "string", "optional": true}, {"name": "columnNumber", "type": "number", "optional": true}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "locations"]);
+InspectorBackend.registerCommand("Debugger.setBreakpoint", [{"name": "location", "type": "object", "optional": false}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "actualLocation"]);
</ins><span class="cx"> InspectorBackend.registerCommand("Debugger.removeBreakpoint", [{"name": "breakpointId", "type": "string", "optional": false}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Debugger.continueToLocation", [{"name": "location", "type": "object", "optional": false}], []);
</span><span class="cx"> InspectorBackend.registerCommand("Debugger.stepOver", [], []);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -390,6 +390,11 @@
</span><span class="cx"> <script src="BreakpointActionView.js"></script>
</span><span class="cx"> <script src="Breakpoint.js"></script>
</span><span class="cx"> <script src="DebuggerManager.js"></script>
</span><ins>+ <script src="ProbeManager.js"></script>
+ <script src="Probe.js"></script>
+ <script src="ProbeSet.js"></script>
+ <script src="ProbeSetDataFrame.js"></script>
+ <script src="ProbeSetDataTable.js"></script>
</ins><span class="cx"> <script src="SourceMapManager.js"></script>
</span><span class="cx"> <script src="Script.js"></script>
</span><span class="cx"> <script src="SourceMap.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.js (163476 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.js 2014-02-05 21:54:49 UTC (rev 163476)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> this.sourceMapManager = new WebInspector.SourceMapManager;
</span><span class="cx"> this.layerTreeManager = new WebInspector.LayerTreeManager;
</span><span class="cx"> this.dashboardManager = new WebInspector.DashboardManager;
</span><ins>+ this.probeManager = new WebInspector.ProbeManager;
</ins><span class="cx">
</span><span class="cx"> // Enable the Console Agent after creating the singleton managers.
</span><span class="cx"> if (window.ConsoleAgent)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProbejs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/Probe.js (0 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Probe.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Probe.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+/*
+ * Copyright (C) 2013 University of Washington. All rights reserved.
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER 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.ProbeSample = function(sampleId, batchId, timestamp, payload)
+{
+ this.sampleId = sampleId;
+ this.batchId = batchId;
+ this.timestamp = timestamp;
+ this.object = WebInspector.RemoteObject.fromPayload(payload);
+};
+
+WebInspector.Probe = function(id, breakpoint, expression)
+{
+ WebInspector.Object.call(this);
+
+ console.assert(id);
+ console.assert(breakpoint instanceof WebInspector.Breakpoint);
+
+ this._id = id;
+ this._breakpoint = breakpoint;
+ this._expression = expression;
+ this._samples = [];
+};
+
+WebInspector.Object.addConstructorFunctions(WebInspector.Probe);
+
+WebInspector.Probe.Event = {
+ ExpressionChanged: "probe-object-expression-changed",
+ SampleAdded: "probe-object-sample-added",
+ SamplesCleared: "probe-object-samples-cleared"
+};
+
+WebInspector.Probe.prototype = {
+ constructor: WebInspector.Probe,
+ __proto__: WebInspector.Object.prototype,
+
+ // Public
+
+ get id()
+ {
+ return this._id;
+ },
+
+ get breakpoint()
+ {
+ return this._breakpoint;
+ },
+
+ get expression()
+ {
+ return this._expression;
+ },
+
+ set expression(value)
+ {
+ if (this._expression === value)
+ return;
+
+ var data = {oldValue: this._expression, newValue: value};
+ this._expression = value;
+ this.clearSamples();
+ this.dispatchEventToListeners(WebInspector.Probe.Event.ExpressionChanged, data);
+ },
+
+ get samples()
+ {
+ return this._samples.slice();
+ },
+
+ clearSamples: function()
+ {
+ this._samples = [];
+ this.dispatchEventToListeners(WebInspector.Probe.Event.SamplesCleared);
+ },
+
+ addSample: function(sample)
+ {
+ console.assert(sample instanceof WebInspector.ProbeSample, "Wrong object type passed as probe sample: ", sample);
+ this._samples.push(sample);
+ this.dispatchEventToListeners(WebInspector.Probe.Event.SampleAdded, sample);
+ }
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProbeManagerjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/ProbeManager.js (0 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/ProbeManager.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/ProbeManager.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -0,0 +1,181 @@
</span><ins>+/*
+ * Copyright (C) 2013 University of Washington. All rights reserved.
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER 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.ProbeManager = function()
+{
+ WebInspector.Object.call(this);
+
+ // Used to detect deleted probe actions.
+ this._knownProbeIdentifiersForBreakpoint = new Map;
+
+ // Main lookup tables for probes and probe sets.
+ this._probesByIdentifier = new Map;
+ this._probeSetsByBreakpoint = new Map;
+
+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointAdded, this._breakpointAdded, this);
+ WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.BreakpointRemoved, this._breakpointRemoved, this);
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ActionsDidChange, this._breakpointActionsChanged, this);
+
+ // Saved breakpoints should not be restored on the first event loop turn, because it
+ // makes manager initialization order very fragile. No breakpoints should be available.
+ console.assert(!WebInspector.debuggerManager.breakpoints.length, "No breakpoints should exist before all the managers are constructed.");
+}
+
+WebInspector.ProbeManager.Event = {
+ ProbeSetAdded: "probe-manager-probe-set-added",
+ ProbeSetRemoved: "probe-manager-probe-set-removed",
+};
+
+WebInspector.ProbeManager.prototype = {
+ constructor: WebInspector.ProbeManager,
+ __proto__: WebInspector.Object.prototype,
+
+ // Public
+
+ get probeSets()
+ {
+ var sets = [];
+ for (var set of this._probeSetsByBreakpoint.values())
+ sets.push(set);
+
+ return sets;
+ },
+
+ probeSetForBreakpoint: function(breakpoint)
+ {
+ return this._probeSetsByBreakpoint.get(breakpoint);
+ },
+
+ // Protected (called by WebInspector.DebuggerObserver)
+
+ didSampleProbe: function(sample)
+ {
+ console.assert(this._probesByIdentifier.has(sample.probeId), "Unknown probe identifier specified for sample: ", sample);
+ var probe = this._probesByIdentifier.get(sample.probeId);
+ probe.addSample(new WebInspector.ProbeSample(sample.sampleId, sample.batchId, sample.timestamp, sample.payload));
+ },
+
+ // Private
+
+ _breakpointAdded: function(breakpointOrEvent)
+ {
+ var breakpoint;
+ if (breakpointOrEvent instanceof WebInspector.Breakpoint)
+ breakpoint = breakpointOrEvent;
+ else
+ breakpoint = breakpointOrEvent.data.breakpoint;
+
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unknown object passed as breakpoint: ", breakpoint);
+
+ if (this._knownProbeIdentifiersForBreakpoint.has(breakpoint))
+ return;
+
+ this._knownProbeIdentifiersForBreakpoint.set(breakpoint, new Set);
+
+ this._breakpointActionsChanged(breakpoint);
+ },
+
+ _breakpointRemoved: function(event)
+ {
+ var breakpoint = event.data.breakpoint;
+ console.assert(this._knownProbeIdentifiersForBreakpoint.has(breakpoint));
+
+ this._breakpointActionsChanged(breakpoint);
+ this._knownProbeIdentifiersForBreakpoint.delete(breakpoint);
+ },
+
+ _breakpointActionsChanged: function(breakpointOrEvent)
+ {
+ var breakpoint;
+ if (breakpointOrEvent instanceof WebInspector.Breakpoint)
+ breakpoint = breakpointOrEvent;
+ else
+ breakpoint = breakpointOrEvent.target;
+
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unknown object passed as breakpoint: ", breakpoint);
+
+ // Sometimes actions change before the added breakpoint is fully dispatched.
+ if (!this._knownProbeIdentifiersForBreakpoint.has(breakpoint)) {
+ this._breakpointAdded(breakpoint);
+ return;
+ }
+
+ var knownProbeIdentifiers = this._knownProbeIdentifiersForBreakpoint.get(breakpoint);
+ var seenProbeIdentifiers = new Set;
+
+ breakpoint.probeActions.forEach(function(probeAction) {
+ var probeIdentifier = probeAction.id;
+ console.assert(probeIdentifier, "Probe added without breakpoint action identifier: ", breakpoint);
+
+ seenProbeIdentifiers.add(probeIdentifier);
+ if (!knownProbeIdentifiers.has(probeIdentifier)) {
+ // New probe; find or create relevant probe set.
+ knownProbeIdentifiers.add(probeIdentifier);
+ var probeSet = this._probeSetForBreakpoint(breakpoint);
+ var newProbe = new WebInspector.Probe(probeIdentifier, breakpoint, probeAction.data);
+ this._probesByIdentifier.set(probeIdentifier, newProbe);
+ probeSet.addProbe(newProbe);
+ return;
+ }
+
+ var probe = this._probesByIdentifier.get(probeIdentifier);
+ console.assert(probe, "Probe known but couldn't be found by identifier: ", probeIdentifier);
+ // Update probe expression; if it differed, change events will fire.
+ probe.expression = probeAction.data;
+ }, this);
+
+ // Look for missing probes based on what we saw last.
+ knownProbeIdentifiers.forEach(function(probeIdentifier) {
+ if (seenProbeIdentifiers.has(probeIdentifier))
+ return;
+
+ // The probe has gone missing, remove it.
+ var probeSet = this._probeSetForBreakpoint(breakpoint);
+ var probe = this._probesByIdentifier.get(probeIdentifier);
+ this._probesByIdentifier.delete(probeIdentifier);
+ knownProbeIdentifiers.delete(probeIdentifier);
+ probeSet.removeProbe(probe);
+
+ // Remove the probe set if it has become empty.
+ if (!probeSet.probes.length) {
+ this._probeSetsByBreakpoint.delete(probeSet.breakpoint);
+ probeSet.willRemove();
+ this.dispatchEventToListeners(WebInspector.ProbeManager.Event.ProbeSetRemoved, probeSet);
+ }
+ }, this);
+ },
+
+ _probeSetForBreakpoint: function(breakpoint)
+ {
+ if (this._probeSetsByBreakpoint.has(breakpoint))
+ return this._probeSetsByBreakpoint.get(breakpoint);
+
+ var newProbeSet = new WebInspector.ProbeSet(breakpoint);
+ this._probeSetsByBreakpoint.set(breakpoint, newProbeSet);
+ this.dispatchEventToListeners(WebInspector.ProbeManager.Event.ProbeSetAdded, newProbeSet);
+ return newProbeSet;
+ }
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProbeSetjs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/ProbeSet.js (0 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/ProbeSet.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/ProbeSet.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -0,0 +1,161 @@
</span><ins>+/*
+ * Copyright (C) 2013 University of Washington. All rights reserved.
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER 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.
+ */
+
+// A ProbeSet clusters Probes from the same Breakpoint and their samples.
+
+WebInspector.ProbeSet = function(breakpoint)
+{
+ console.assert(breakpoint instanceof WebInspector.Breakpoint, "Unknown breakpoint argument: ", breakpoint);
+
+ WebInspector.Object.call(this);
+ this._breakpoint = breakpoint;
+ this._probes = [];
+ this._probesByIdentifier = new Map;
+
+ this._createDataTable();
+
+ WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceChanged, this);
+ WebInspector.Probe.addEventListener(WebInspector.Probe.Event.SampleAdded, this._sampleCollected, this);
+ WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._breakpointResolvedStateDidChange, this);
+}
+
+WebInspector.Object.addConstructorFunctions(WebInspector.ProbeSet);
+
+WebInspector.ProbeSet.Event = {
+ ProbeAdded: "probe-set-probe-added",
+ ProbeRemoved: "probe-set-probe-removed",
+ ResolvedStateDidChange: "probe-set-resolved-state-did-change",
+ SamplesCleared: "probe-set-samples-cleared",
+};
+
+WebInspector.ProbeSet.SampleObjectTitle = "Object";
+
+WebInspector.ProbeSet.prototype = {
+ constructor: WebInspector.ProbeSet,
+ __proto__: WebInspector.Object.prototype,
+
+ // Public
+
+ get breakpoint()
+ {
+ return this._breakpoint;
+ },
+
+ get probes()
+ {
+ return this._probes.slice();
+ },
+
+ get dataTable()
+ {
+ return this._dataTable;
+ },
+
+ clear: function()
+ {
+ this._breakpoint.clearActions(WebInspector.BreakpointAction.Type.Probe);
+ },
+
+ clearSamples: function()
+ {
+ for (var probe of this._probes)
+ probe.clearSamples();
+
+ this._createDataTable();
+ this.dispatchEventToListeners(WebInspector.ProbeSet.Event.SamplesCleared, this);
+ },
+
+ createProbe: function(expression)
+ {
+ this.breakpoint.createAction(WebInspector.BreakpointAction.Type.Probe, null, expression);
+ },
+
+ addProbe: function(probe)
+ {
+ console.assert(probe instanceof WebInspector.Probe, "Tried to add non-probe ", probe, " to probe group", this);
+ console.assert(probe.breakpoint === this.breakpoint, "Probe and ProbeSet must have same breakpoint.", probe, this);
+
+ this._probes.push(probe);
+ this._probesByIdentifier.set(probe.identifier, probe);
+
+ this.dataTable.addProbe(probe);
+ this.dispatchEventToListeners(WebInspector.ProbeSet.Event.ProbeAdded, probe);
+ },
+
+ removeProbe: function(probe)
+ {
+ console.assert(probe instanceof WebInspector.Probe, "Tried to remove non-probe ", probe, " to probe group", this);
+ console.assert(this._probes.indexOf(probe) != -1, "Tried to remove probe", probe, " not in group ", this);
+ console.assert(this._probesByIdentifier.has(probe.identifier), "Tried to remove probe", probe, " not in group ", this);
+
+ this._probes.splice(this._probes.indexOf(probe), 1);
+ this._probesByIdentifier.delete(probe.identifier);
+ this.dataTable.removeProbe(probe);
+ this.dispatchEventToListeners(WebInspector.ProbeSet.Event.ProbeRemoved, probe);
+ },
+
+ willRemove: function()
+ {
+ console.assert(!this._probes.length, "ProbeSet.willRemove called, but probes still associated with group: ", this._probes);
+
+ WebInspector.Frame.removeEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceChanged, this);
+ WebInspector.Probe.removeEventListener(WebInspector.Probe.Event.SampleAdded, this._sampleCollected, this);
+ WebInspector.Breakpoint.removeEventListener(WebInspector.Breakpoint.Event.ResolvedStateDidChange, this._breakpointResolvedStateDidChange, this);
+ },
+
+ // Private
+
+ _mainResourceChanged: function()
+ {
+ this.dataTable.mainResourceChanged();
+ },
+
+ _createDataTable: function()
+ {
+ if (this.dataTable)
+ this.dataTable.willRemove();
+
+ this._dataTable = new WebInspector.ProbeSetDataTable(this);
+ },
+
+ _sampleCollected: function(event)
+ {
+ var sample = event.data;
+ console.assert(sample instanceof WebInspector.ProbeSample, "Tried to add non-sample to probe group: ", sample);
+
+ var probe = event.target;
+ if (!this._probesByIdentifier.has(probe.identifier))
+ return;
+
+ console.assert(this.dataTable);
+ this.dataTable.addSampleForProbe(probe, sample);
+ },
+
+ _breakpointResolvedStateDidChange: function(event)
+ {
+ this.dispatchEventToListeners(WebInspector.ProbeSet.Event.ResolvedStateDidChange);
+ }
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProbeSetDataFramejs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataFrame.js (0 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataFrame.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataFrame.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -0,0 +1,97 @@
</span><ins>+/*
+ * Copyright (C) 2013 University of Washington. All rights reserved.
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER 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.ProbeSetDataFrame = function(index)
+{
+ this._count = 0;
+ this._index = index;
+ this._separator = false;
+};
+
+WebInspector.ProbeSetDataFrame.compare = function(a, b) {
+ console.assert(a instanceof WebInspector.ProbeSetDataFrame, a);
+ console.assert(b instanceof WebInspector.ProbeSetDataFrame, b);
+
+ return a.index - b.index;
+}
+
+WebInspector.ProbeSetDataFrame.MissingValue = "?";
+
+WebInspector.ProbeSetDataFrame.prototype = {
+ constructor: WebInspector.ProbeSetDataFrame,
+
+ // Public
+
+ get key()
+ {
+ return String(this._index);
+ },
+
+ get count()
+ {
+ return this._count;
+ },
+
+ get index()
+ {
+ return this._index;
+ },
+
+ get isSeparator()
+ {
+ return this._separator;
+ },
+
+ // The last data frame before a main frame navigation is marked as a "separator" frame.
+ set isSeparator(value)
+ {
+ this._separator = !!value;
+ },
+
+ addSampleForProbe: function(probe, sample)
+ {
+ this[probe.id] = sample;
+ this._count++;
+ },
+
+ missingKeys: function(probeSet)
+ {
+ return probeSet.probes.filter(function(probe) {
+ return !this.hasOwnProperty(probe.id);
+ }, this);
+ },
+
+ isComplete: function(probeSet)
+ {
+ return !this.missingKeys(probeSet).length;
+ },
+
+ fillMissingValues: function(probeSet)
+ {
+ for (var key of this.missingKeys(probeSet))
+ this[key] = WebInspector.ProbeSetDataFrame.MissingValue;
+ }
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProbeSetDataTablejs"></a>
<div class="addfile"><h4>Added: trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataTable.js (0 => 163477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataTable.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/ProbeSetDataTable.js 2014-02-05 22:21:40 UTC (rev 163477)
</span><span class="lines">@@ -0,0 +1,134 @@
</span><ins>+/*
+ * Copyright (C) 2013 University of Washington. All rights reserved.
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER 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.ProbeSetDataTable = function(probeSet)
+{
+ WebInspector.Object.call(this);
+
+ this._probeSet = probeSet;
+ this._frames = [];
+ this._previousBatchIdentifier = WebInspector.ProbeSetDataTable.SentinelValue;
+};
+
+WebInspector.ProbeSetDataTable.Event = {
+ FrameInserted: "probe-set-data-table-frame-inserted",
+ SeparatorInserted: "probe-set-data-table-separator-inserted",
+ WillRemove: "probe-set-data-table-will-remove"
+};
+
+WebInspector.ProbeSetDataTable.SentinelValue = -1;
+WebInspector.ProbeSetDataTable.UnknownValue = "?";
+
+WebInspector.ProbeSetDataTable.prototype = {
+ constructor: WebInspector.ProbeSetDataTable,
+ __proto__: WebInspector.Object.prototype,
+
+ // Public
+
+ get frames()
+ {
+ return this._frames.slice();
+ },
+
+ get separators()
+ {
+ return this._frames.filter(function(frame) { return frame.isSeparator; });
+ },
+
+ willRemove: function()
+ {
+ this.dispatchEventToListeners(WebInspector.ProbeSetDataTable.Event.WillRemove);
+ this._frames = [];
+ delete this._probeSet;
+ },
+
+ mainResourceChanged: function()
+ {
+ this.addSeparator();
+ },
+
+ addSampleForProbe: function(probe, sample)
+ {
+ // Eagerly save the frame if the batch identifier differs, or we know the frame is full.
+ // Create a new frame when the batch identifier differs.
+ if (sample.batchId != this._previousBatchIdentifier) {
+ if (this._openFrame) {
+ this._openFrame.fillMissingValues(this._probeSet);
+ this.addFrame(this._openFrame);
+ }
+ this._openFrame = this.createFrame();
+ this._previousBatchIdentifier = sample.batchId;
+ }
+
+ console.assert(this._openFrame, "Should always have an open frame before adding sample.", this, probe, sample);
+ this._openFrame.addSampleForProbe(probe, sample);
+ if (this._openFrame.count == this._probeSet.probes.length) {
+ this.addFrame(this._openFrame);
+ this._openFrame = null;
+ }
+ },
+
+ addProbe: function(probe)
+ {
+ for (var frame of this.frames)
+ if (!frame[probe.id])
+ frame[probe.id] = WebInspector.ProbeSetDataTable.UnknownValue;
+ },
+
+ removeProbe: function(probe)
+ {
+ for (var frame of this.frames)
+ delete frames[i][probe.id];
+ },
+
+ // Protected - can be overridden by subclasses.
+
+ createFrame: function()
+ {
+ return new WebInspector.ProbeSetDataFrame(this._frames.length);
+ },
+
+ addFrame: function(frame)
+ {
+ this._frames.push(frame);
+ this.dispatchEventToListeners(WebInspector.ProbeSetDataTable.Event.FrameInserted, frame);
+ },
+
+ addSeparator: function()
+ {
+ // Separators must be associated with a frame.
+ if (!this._frames.length)
+ return;
+
+ var previousFrame = this._frames.lastValue;
+ // Don't send out duplicate events for adjacent separators.
+ if (previousFrame.isSeparator)
+ return;
+
+ previousFrame.isSeparator = true;
+ this.dispatchEventToListeners(WebInspector.ProbeSetDataTable.Event.SeparatorInserted, previousFrame);
+ }
+};
</ins></span></pre>
</div>
</div>
</body>
</html>