<!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>[208664] trunk/Source/WebInspectorUI</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/208664">208664</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-12 21:38:58 -0800 (Sat, 12 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Type Profiler and Code Coverage Profiler should work in Workers
https://bugs.webkit.org/show_bug.cgi?id=164682
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-11-12
Reviewed by Darin Adler.
* UserInterface/Controllers/BasicBlockAnnotator.js:
* UserInterface/Models/ScriptSyntaxTree.js:
(WebInspector.ScriptSyntaxTree.prototype.updateTypes):
Use the target associated with the Script.
* UserInterface/Protocol/Target.js:
(WebInspector.WorkerTarget.prototype.initialize):
When initializing a Worker Target, match the existing state
of the Page for these profilers.
* UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedJavaScriptTypeInformation):
(WebInspector.SourceCodeTextEditor.prototype.willDismissPopover):
Use the correct target for this Script / Resource.
(WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
(WebInspector.SourceCodeTextEditor.prototype.set _basicBlockAnnotatorEnabled):
Enable / disable for all targets when toggling profilers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersBasicBlockAnnotatorjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/BasicBlockAnnotator.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceProtocolTargetjs">trunk/Source/WebInspectorUI/UserInterface/Protocol/Target.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs">trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (208663 => 208664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-11-13 04:52:31 UTC (rev 208663)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-11-13 05:38:58 UTC (rev 208664)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-11-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Type Profiler and Code Coverage Profiler should work in Workers
+ https://bugs.webkit.org/show_bug.cgi?id=164682
+
+ Reviewed by Darin Adler.
+
+ * UserInterface/Controllers/BasicBlockAnnotator.js:
+ * UserInterface/Models/ScriptSyntaxTree.js:
+ (WebInspector.ScriptSyntaxTree.prototype.updateTypes):
+ Use the target associated with the Script.
+
+ * UserInterface/Protocol/Target.js:
+ (WebInspector.WorkerTarget.prototype.initialize):
+ When initializing a Worker Target, match the existing state
+ of the Page for these profilers.
+
+ * UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._tokenTrackingControllerHighlightedJavaScriptTypeInformation):
+ (WebInspector.SourceCodeTextEditor.prototype.willDismissPopover):
+ Use the correct target for this Script / Resource.
+
+ (WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
+ (WebInspector.SourceCodeTextEditor.prototype.set _basicBlockAnnotatorEnabled):
+ Enable / disable for all targets when toggling profilers.
+
</ins><span class="cx"> 2016-11-11 Anthony Ricaud <rik@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Whitespace in Editor should be less visible than regular content
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersBasicBlockAnnotatorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/BasicBlockAnnotator.js (208663 => 208664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/BasicBlockAnnotator.js 2016-11-13 04:52:31 UTC (rev 208663)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/BasicBlockAnnotator.js 2016-11-13 05:38:58 UTC (rev 208664)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> var sourceID = this._script.id;
</span><span class="cx"> var startTime = Date.now();
</span><span class="cx">
</span><del>- RuntimeAgent.getBasicBlocks(sourceID, function(error, basicBlocks) {
</del><ins>+ this._script.target.RuntimeAgent.getBasicBlocks(sourceID, function(error, basicBlocks) {
</ins><span class="cx"> if (error) {
</span><span class="cx"> console.error("Error in getting basic block locations: " + error);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsScriptSyntaxTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js (208663 => 208664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2016-11-13 04:52:31 UTC (rev 208663)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ScriptSyntaxTree.js 2016-11-13 05:38:58 UTC (rev 208664)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> callback(allRequestNodes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RuntimeAgent.getRuntimeTypesForVariablesAtOffsets(allRequests, handleTypes);
</del><ins>+ this._script.target.RuntimeAgent.getRuntimeTypesForVariablesAtOffsets(allRequests, handleTypes);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Private
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceProtocolTargetjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/Target.js (208663 => 208664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Protocol/Target.js 2016-11-13 04:52:31 UTC (rev 208663)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/Target.js 2016-11-13 05:38:58 UTC (rev 208664)
</span><span class="lines">@@ -142,10 +142,12 @@
</span><span class="cx"> WebInspector.frameResourceManager.adoptOrphanedResourcesForTarget(this);
</span><span class="cx">
</span><span class="cx"> if (this.RuntimeAgent) {
</span><ins>+ this._executionContext = new WebInspector.ExecutionContext(this, WebInspector.RuntimeManager.TopLevelContextExecutionIdentifier, this.displayName, false, null);
</ins><span class="cx"> this.RuntimeAgent.enable();
</span><del>- this._executionContext = new WebInspector.ExecutionContext(this, WebInspector.RuntimeManager.TopLevelContextExecutionIdentifier, this.displayName, false, null);
- // FIXME: Enable Type Profiler
- // FIXME: Enable Code Coverage Profiler
</del><ins>+ if (WebInspector.showJavaScriptTypeInformationSetting && WebInspector.showJavaScriptTypeInformationSetting.value)
+ this.RuntimeAgent.enableTypeProfiler();
+ if (WebInspector.enableControlFlowProfilerSetting && WebInspector.enableControlFlowProfilerSetting.value)
+ this.RuntimeAgent.enableControlFlowProfiler();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (this.DebuggerAgent)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (208663 => 208664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2016-11-13 04:52:31 UTC (rev 208663)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2016-11-13 05:38:58 UTC (rev 208664)
</span><span class="lines">@@ -268,12 +268,14 @@
</span><span class="cx"> if (!watchExpressions.length) {
</span><span class="cx"> if (this._usedWatchExpressionsObjectGroup) {
</span><span class="cx"> this._usedWatchExpressionsObjectGroup = false;
</span><del>- RuntimeAgent.releaseObjectGroup(WebInspector.ScopeChainDetailsSidebarPanel.WatchExpressionsObjectGroupName);
</del><ins>+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.releaseObjectGroup(WebInspector.ScopeChainDetailsSidebarPanel.WatchExpressionsObjectGroupName);
</ins><span class="cx"> }
</span><span class="cx"> return Promise.resolve(null);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RuntimeAgent.releaseObjectGroup(WebInspector.ScopeChainDetailsSidebarPanel.WatchExpressionsObjectGroupName);
</del><ins>+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.releaseObjectGroup(WebInspector.ScopeChainDetailsSidebarPanel.WatchExpressionsObjectGroupName);
</ins><span class="cx"> this._usedWatchExpressionsObjectGroup = true;
</span><span class="cx">
</span><span class="cx"> let watchExpressionsRemoteObject = WebInspector.RemoteObject.createFakeRemoteObject();
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (208663 => 208664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-11-13 04:52:31 UTC (rev 208663)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-11-13 05:38:58 UTC (rev 208664)
</span><span class="lines">@@ -1589,7 +1589,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RuntimeAgent.getRuntimeTypesForVariablesAtOffsets(allRequests, handler.bind(this));
</del><ins>+ this.target.RuntimeAgent.getRuntimeTypesForVariablesAtOffsets(allRequests, handler.bind(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _showPopover(content, bounds)
</span><span class="lines">@@ -1731,7 +1731,7 @@
</span><span class="cx"> {
</span><span class="cx"> this.tokenTrackingController.removeHighlightedRange();
</span><span class="cx">
</span><del>- RuntimeAgent.releaseObjectGroup("popover");
</del><ins>+ this.target.RuntimeAgent.releaseObjectGroup("popover");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _dismissPopover()
</span><span class="lines">@@ -1870,13 +1870,18 @@
</span><span class="cx">
</span><span class="cx"> if (shouldActivate) {
</span><span class="cx"> console.assert(this.visible, "Annotators should not be enabled if the TextEditor is not visible");
</span><del>- RuntimeAgent.enableTypeProfiler();
</del><ins>+
+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.enableTypeProfiler();
+
</ins><span class="cx"> this._typeTokenAnnotator.reset();
</span><span class="cx">
</span><span class="cx"> if (!this._typeTokenScrollHandler)
</span><span class="cx"> this._enableScrollEventsForTypeTokenAnnotator();
</span><span class="cx"> } else {
</span><del>- RuntimeAgent.disableTypeProfiler();
</del><ins>+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.disableTypeProfiler();
+
</ins><span class="cx"> this._typeTokenAnnotator.clear();
</span><span class="cx">
</span><span class="cx"> if (this._typeTokenScrollHandler)
</span><span class="lines">@@ -1896,7 +1901,8 @@
</span><span class="cx"> if (shouldActivate) {
</span><span class="cx"> console.assert(this.visible, "Annotators should not be enabled if the TextEditor is not visible");
</span><span class="cx">
</span><del>- RuntimeAgent.enableControlFlowProfiler();
</del><ins>+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.enableControlFlowProfiler();
</ins><span class="cx">
</span><span class="cx"> console.assert(!this._basicBlockAnnotator.isActive());
</span><span class="cx"> this._basicBlockAnnotator.reset();
</span><span class="lines">@@ -1904,7 +1910,9 @@
</span><span class="cx"> if (!this._controlFlowScrollHandler)
</span><span class="cx"> this._enableScrollEventsForControlFlowAnnotator();
</span><span class="cx"> } else {
</span><del>- RuntimeAgent.disableControlFlowProfiler();
</del><ins>+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.disableControlFlowProfiler();
+
</ins><span class="cx"> this._basicBlockAnnotator.clear();
</span><span class="cx">
</span><span class="cx"> if (this._controlFlowScrollHandler)
</span></span></pre>
</div>
</div>
</body>
</html>