<!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>[202352] 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/202352">202352</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 15:05:40 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: don't start auto capturing if the Inspector window is not visible
https://bugs.webkit.org/show_bug.cgi?id=159014
<rdar://problem/26931269>
Reviewed by Joseph Pecoraro.
TimelineTabContentView should not tell the timeline manager to enable
auto-capturing unless the Web Inspector UI is visible. If it is preloaded
but not shown to the user, then auto-capturing may inadvertently disable
the debugger, causing it to miss `debugger` statements and not bring the
inspector to front.
* UserInterface/Controllers/TimelineManager.js:
(WebInspector.TimelineManager.prototype.set autoCaptureOnPageLoad):
Bail out if nothing changed. Coerce to a boolean since the backend requires a boolean.
* UserInterface/Views/TimelineTabContentView.js:
(WebInspector.TimelineTabContentView): Listen for UI visibility changes.
(WebInspector.TimelineTabContentView.prototype.shown):
Enable auto-capturing if the UI is visible.
(WebInspector.TimelineTabContentView.prototype.closed): Added.
Remove listeners on global objects so this tab doesn't leak.
(WebInspector.TimelineTabContentView.prototype._inspectorVisibilityChanged):
Update the auto-capturing setting if the UI became visible or not visible.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTimelineTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (202351 => 202352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-06-22 21:41:01 UTC (rev 202351)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-06-22 22:05:40 UTC (rev 202352)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-06-22 Brian Burg <bburg@apple.com>
+
+ Web Inspector: don't start auto capturing if the Inspector window is not visible
+ https://bugs.webkit.org/show_bug.cgi?id=159014
+ <rdar://problem/26931269>
+
+ Reviewed by Joseph Pecoraro.
+
+ TimelineTabContentView should not tell the timeline manager to enable
+ auto-capturing unless the Web Inspector UI is visible. If it is preloaded
+ but not shown to the user, then auto-capturing may inadvertently disable
+ the debugger, causing it to miss `debugger` statements and not bring the
+ inspector to front.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype.set autoCaptureOnPageLoad):
+ Bail out if nothing changed. Coerce to a boolean since the backend requires a boolean.
+
+ * UserInterface/Views/TimelineTabContentView.js:
+ (WebInspector.TimelineTabContentView): Listen for UI visibility changes.
+ (WebInspector.TimelineTabContentView.prototype.shown):
+ Enable auto-capturing if the UI is visible.
+
+ (WebInspector.TimelineTabContentView.prototype.closed): Added.
+ Remove listeners on global objects so this tab doesn't leak.
+
+ (WebInspector.TimelineTabContentView.prototype._inspectorVisibilityChanged):
+ Update the auto-capturing setting if the UI became visible or not visible.
+
</ins><span class="cx"> 2016-06-22 Nikita Vasilyev <nvasilyev@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Simplify CSS rule for ContentBrowser navigation bar items
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersTimelineManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (202351 => 202352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2016-06-22 21:41:01 UTC (rev 202351)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2016-06-22 22:05:40 UTC (rev 202352)
</span><span class="lines">@@ -135,10 +135,15 @@
</span><span class="cx">
</span><span class="cx"> set autoCaptureOnPageLoad(autoCapture)
</span><span class="cx"> {
</span><ins>+ autoCapture = !!autoCapture;
+
+ if (this._autoCaptureOnPageLoad === autoCapture)
+ return;
+
</ins><span class="cx"> this._autoCaptureOnPageLoad = autoCapture;
</span><span class="cx">
</span><span class="cx"> if (window.TimelineAgent && TimelineAgent.setAutoCaptureEnabled)
</span><del>- TimelineAgent.setAutoCaptureEnabled(autoCapture);
</del><ins>+ TimelineAgent.setAutoCaptureEnabled(this._autoCaptureOnPageLoad);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get enabledTimelineTypes()
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTimelineTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js (202351 => 202352)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-06-22 21:41:01 UTC (rev 202351)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-06-22 22:05:40 UTC (rev 202352)
</span><span class="lines">@@ -70,6 +70,8 @@
</span><span class="cx"> WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStarted, this._capturingStartedOrStopped, this);
</span><span class="cx"> WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._capturingStartedOrStopped, this);
</span><span class="cx">
</span><ins>+ WebInspector.notifications.addEventListener(WebInspector.Notification.VisibilityStateDidChange, this._inspectorVisibilityChanged, this);
+
</ins><span class="cx"> this._displayedRecording = null;
</span><span class="cx"> this._displayedContentView = null;
</span><span class="cx"> this._viewMode = null;
</span><span class="lines">@@ -277,7 +279,8 @@
</span><span class="cx"> this._toggleRecordingShortcut.disabled = false;
</span><span class="cx"> this._toggleNewRecordingShortcut.disabled = false;
</span><span class="cx">
</span><del>- WebInspector.timelineManager.autoCaptureOnPageLoad = true;
</del><ins>+ if (WebInspector.visible)
+ WebInspector.timelineManager.autoCaptureOnPageLoad = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> hidden()
</span><span class="lines">@@ -290,6 +293,15 @@
</span><span class="cx"> WebInspector.timelineManager.autoCaptureOnPageLoad = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ closed()
+ {
+ if (WebInspector.FPSInstrument.supported())
+ this.contentBrowser.navigationBar.removeEventListener(null, null, this);
+
+ WebInspector.timelineManager.removeEventListener(null, null, this);
+ WebInspector.notifications.removeEventListener(null, null, this);
+ }
+
</ins><span class="cx"> canShowRepresentedObject(representedObject)
</span><span class="cx"> {
</span><span class="cx"> return representedObject instanceof WebInspector.TimelineRecording;
</span><span class="lines">@@ -362,6 +374,11 @@
</span><span class="cx"> this._recordButton.toggled = isCapturing;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _inspectorVisibilityChanged(event)
+ {
+ WebInspector.timelineManager.autoCaptureOnPageLoad = !!this.visible && !!WebInspector.visible;
+ }
+
</ins><span class="cx"> _toggleRecordingOnSpacebar(event)
</span><span class="cx"> {
</span><span class="cx"> if (WebInspector.isEventTargetAnEditableField(event))
</span></span></pre>
</div>
</div>
</body>
</html>