<!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>[209631] 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/209631">209631</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-09 14:43:54 -0800 (Fri, 09 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Frontend should not be resetting TypeProfiler state when switching between ContentViews
https://bugs.webkit.org/show_bug.cgi?id=165648
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-12-09
Reviewed by Brian Burg.
* UserInterface/Base/Main.js:
(WebInspector.loaded):
Update all backends when the state changes.
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
(WebInspector.SourceCodeTextEditor.prototype.set _basicBlockAnnotatorEnabled):
Moved this code to when the global Setting (which affects all editors) changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#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 (209630 => 209631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-12-09 22:38:39 UTC (rev 209630)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-12-09 22:43:54 UTC (rev 209631)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-12-09 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Frontend should not be resetting TypeProfiler state when switching between ContentViews
+ https://bugs.webkit.org/show_bug.cgi?id=165648
+
+ Reviewed by Brian Burg.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.loaded):
+ Update all backends when the state changes.
+
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype._setTypeTokenAnnotatorEnabledState):
+ (WebInspector.SourceCodeTextEditor.prototype.set _basicBlockAnnotatorEnabled):
+ Moved this code to when the global Setting (which affects all editors) changes.
+
+2016-12-09 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Some resources fetched via Fetch API do not have data
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165230
</span><span class="cx"> <rdar://problem/29449220>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (209630 => 209631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-12-09 22:38:39 UTC (rev 209630)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2016-12-09 22:43:54 UTC (rev 209631)
</span><span class="lines">@@ -167,10 +167,12 @@
</span><span class="cx">
</span><span class="cx"> // COMPATIBILITY (iOS 8): Page.enableTypeProfiler did not exist.
</span><span class="cx"> this.showJavaScriptTypeInformationSetting = new WebInspector.Setting("show-javascript-type-information", false);
</span><ins>+ this.showJavaScriptTypeInformationSetting.addEventListener(WebInspector.Setting.Event.Changed, this._showJavaScriptTypeInformationSettingChanged, this);
</ins><span class="cx"> if (this.showJavaScriptTypeInformationSetting.value && window.RuntimeAgent && RuntimeAgent.enableTypeProfiler)
</span><span class="cx"> RuntimeAgent.enableTypeProfiler();
</span><span class="cx">
</span><span class="cx"> this.enableControlFlowProfilerSetting = new WebInspector.Setting("enable-control-flow-profiler", false);
</span><ins>+ this.enableControlFlowProfilerSetting.addEventListener(WebInspector.Setting.Event.Changed, this._enableControlFlowProfilerSettingChanged, this);
</ins><span class="cx"> if (this.enableControlFlowProfilerSetting.value && window.RuntimeAgent && RuntimeAgent.enableControlFlowProfiler)
</span><span class="cx"> RuntimeAgent.enableControlFlowProfiler();
</span><span class="cx">
</span><span class="lines">@@ -2089,6 +2091,28 @@
</span><span class="cx"> WebInspector.tabBar.selectedTabBarItem = i - 1;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._showJavaScriptTypeInformationSettingChanged = function(event)
+{
+ if (this.showJavaScriptTypeInformationSetting.value) {
+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.enableTypeProfiler();
+ } else {
+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.disableTypeProfiler();
+ }
+};
+
+WebInspector._enableControlFlowProfilerSettingChanged = function(event)
+{
+ if (this.enableControlFlowProfilerSetting.value) {
+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.enableControlFlowProfiler();
+ } else {
+ for (let target of WebInspector.targets)
+ target.RuntimeAgent.disableControlFlowProfiler();
+ }
+};
+
</ins><span class="cx"> WebInspector.elementDragStart = function(element, dividerDrag, elementDragEnd, event, cursor, eventTarget)
</span><span class="cx"> {
</span><span class="cx"> if (WebInspector._elementDraggingEventListener || WebInspector._elementEndDraggingEventListener)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (209630 => 209631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-12-09 22:38:39 UTC (rev 209630)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2016-12-09 22:43:54 UTC (rev 209631)
</span><span class="lines">@@ -2065,17 +2065,11 @@
</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>- for (let target of WebInspector.targets)
- target.RuntimeAgent.enableTypeProfiler();
-
</del><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>- for (let target of WebInspector.targets)
- target.RuntimeAgent.disableTypeProfiler();
-
</del><span class="cx"> this._typeTokenAnnotator.clear();
</span><span class="cx">
</span><span class="cx"> if (this._typeTokenScrollHandler)
</span><span class="lines">@@ -2095,9 +2089,6 @@
</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>- for (let target of WebInspector.targets)
- target.RuntimeAgent.enableControlFlowProfiler();
-
</del><span class="cx"> console.assert(!this._basicBlockAnnotator.isActive());
</span><span class="cx"> this._basicBlockAnnotator.reset();
</span><span class="cx">
</span><span class="lines">@@ -2104,9 +2095,6 @@
</span><span class="cx"> if (!this._controlFlowScrollHandler)
</span><span class="cx"> this._enableScrollEventsForControlFlowAnnotator();
</span><span class="cx"> } else {
</span><del>- for (let target of WebInspector.targets)
- target.RuntimeAgent.disableControlFlowProfiler();
-
</del><span class="cx"> this._basicBlockAnnotator.clear();
</span><span class="cx">
</span><span class="cx"> if (this._controlFlowScrollHandler)
</span></span></pre>
</div>
</div>
</body>
</html>