<!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>[201099] 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/201099">201099</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-05-18 14:04:27 -0700 (Wed, 18 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: DebuggerSidebarPanel doesn't need to help manage temporarily disabling breakpoints while capturing
https://bugs.webkit.org/show_bug.cgi?id=157854
Reviewed by Timothy Hatcher.
Duplicate the event listeners in DebuggerManager and move non-view-related
state updates out of DebuggerSidebarPanel's listeners into DebuggerManager's listeners.
This allows a test to exercise the temporary-disablement code paths during capturing.
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.prototype.get breakpointsDisabledTemporarily):
Use this to make the code a bit more readable.
(WebInspector.DebuggerManager.prototype._startDisablingBreakpointsTemporarily):
(WebInspector.DebuggerManager.prototype._stopDisablingBreakpointsTemporarily):
(WebInspector.DebuggerManager.prototype.startDisablingBreakpointsTemporarily): Deleted.
(WebInspector.DebuggerManager.prototype.stopDisablingBreakpointsTemporarily): Deleted.
Make this private since it's not used by other classes anymore.
(WebInspector.DebuggerManager.prototype._timelineCapturingWillStart): Added.
(WebInspector.DebuggerManager.prototype._timelineCapturingStopped): Added.
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype._timelineRecordingWillStart): Deleted.
(WebInspector.DebuggerSidebarPanel.prototype._timelineRecordingStopped): Deleted.
(WebInspector.DebuggerSidebarPanel.prototype._timelineCapturingWillStart): Added.
(WebInspector.DebuggerSidebarPanel.prototype._timelineCapturingStopped): Added.
Make the listener names consistent with TimelineManager: timelineCapturing{WillStart,Stopped}.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (201098 => 201099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-05-18 20:42:20 UTC (rev 201098)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-05-18 21:04:27 UTC (rev 201099)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-05-18 Brian Burg <bburg@apple.com>
+
+ Web Inspector: DebuggerSidebarPanel doesn't need to help manage temporarily disabling breakpoints while capturing
+ https://bugs.webkit.org/show_bug.cgi?id=157854
+
+ Reviewed by Timothy Hatcher.
+
+ Duplicate the event listeners in DebuggerManager and move non-view-related
+ state updates out of DebuggerSidebarPanel's listeners into DebuggerManager's listeners.
+ This allows a test to exercise the temporary-disablement code paths during capturing.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype.get breakpointsDisabledTemporarily):
+ Use this to make the code a bit more readable.
+
+ (WebInspector.DebuggerManager.prototype._startDisablingBreakpointsTemporarily):
+ (WebInspector.DebuggerManager.prototype._stopDisablingBreakpointsTemporarily):
+ (WebInspector.DebuggerManager.prototype.startDisablingBreakpointsTemporarily): Deleted.
+ (WebInspector.DebuggerManager.prototype.stopDisablingBreakpointsTemporarily): Deleted.
+ Make this private since it's not used by other classes anymore.
+
+ (WebInspector.DebuggerManager.prototype._timelineCapturingWillStart): Added.
+ (WebInspector.DebuggerManager.prototype._timelineCapturingStopped): Added.
+
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype._timelineRecordingWillStart): Deleted.
+ (WebInspector.DebuggerSidebarPanel.prototype._timelineRecordingStopped): Deleted.
+ (WebInspector.DebuggerSidebarPanel.prototype._timelineCapturingWillStart): Added.
+ (WebInspector.DebuggerSidebarPanel.prototype._timelineCapturingStopped): Added.
+ Make the listener names consistent with TimelineManager: timelineCapturing{WillStart,Stopped}.
+
</ins><span class="cx"> 2016-05-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Improve console.takeHeapSnapshot documentation in console
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (201098 => 201099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2016-05-18 20:42:20 UTC (rev 201098)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2016-05-18 21:04:27 UTC (rev 201099)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014, 2016 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">@@ -40,6 +40,9 @@
</span><span class="cx"> WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.AutoContinueDidChange, this._breakpointEditablePropertyDidChange, this);
</span><span class="cx"> WebInspector.Breakpoint.addEventListener(WebInspector.Breakpoint.Event.ActionsDidChange, this._breakpointEditablePropertyDidChange, this);
</span><span class="cx">
</span><ins>+ WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingWillStart, this._timelineCapturingWillStart, this);
+ WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._timelineCapturingStopped, this);
+
</ins><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx">
</span><span class="cx"> this._allExceptionsBreakpointEnabledSetting = new WebInspector.Setting("break-on-all-exceptions", false);
</span><span class="lines">@@ -345,34 +348,6 @@
</span><span class="cx"> return knownScripts;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- get breakpointsDisabledTemporarily()
- {
- return this._temporarilyDisabledBreakpointsRestoreSetting.value !== null;
- }
-
- startDisablingBreakpointsTemporarily()
- {
- console.assert(this._temporarilyDisabledBreakpointsRestoreSetting.value === null, "Already temporarily disabling breakpoints.");
- if (this._temporarilyDisabledBreakpointsRestoreSetting.value !== null)
- return;
-
- this._temporarilyDisabledBreakpointsRestoreSetting.value = this._breakpointsEnabledSetting.value;
-
- this.breakpointsEnabled = false;
- }
-
- stopDisablingBreakpointsTemporarily()
- {
- console.assert(this._temporarilyDisabledBreakpointsRestoreSetting.value !== null, "Was not temporarily disabling breakpoints.");
- if (this._temporarilyDisabledBreakpointsRestoreSetting.value === null)
- return;
-
- let restoreState = this._temporarilyDisabledBreakpointsRestoreSetting.value;
- this._temporarilyDisabledBreakpointsRestoreSetting.value = null;
-
- this.breakpointsEnabled = restoreState;
- }
-
</del><span class="cx"> addBreakpoint(breakpoint, skipEventDispatch, shouldSpeculativelyResolve)
</span><span class="cx"> {
</span><span class="cx"> console.assert(breakpoint instanceof WebInspector.Breakpoint, "Bad argument to DebuggerManger.addBreakpoint: ", breakpoint);
</span><span class="lines">@@ -890,6 +865,47 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ get breakpointsDisabledTemporarily()
+ {
+ return this._temporarilyDisabledBreakpointsRestoreSetting.value !== null;
+ }
+
+ _startDisablingBreakpointsTemporarily()
+ {
+ console.assert(!this.breakpointsDisabledTemporarily, "Already temporarily disabling breakpoints.");
+ if (this.breakpointsDisabledTemporarily)
+ return;
+
+ this._temporarilyDisabledBreakpointsRestoreSetting.value = this._breakpointsEnabledSetting.value;
+
+ this.breakpointsEnabled = false;
+ }
+
+ _stopDisablingBreakpointsTemporarily()
+ {
+ console.assert(this.breakpointsDisabledTemporarily, "Was not temporarily disabling breakpoints.");
+ if (!this.breakpointsDisabledTemporarily)
+ return;
+
+ let restoreState = this._temporarilyDisabledBreakpointsRestoreSetting.value;
+ this._temporarilyDisabledBreakpointsRestoreSetting.value = null;
+
+ this.breakpointsEnabled = restoreState;
+ }
+
+ _timelineCapturingWillStart(event)
+ {
+ this._startDisablingBreakpointsTemporarily();
+
+ if (this.paused)
+ this.resume();
+ }
+
+ _timelineCapturingStopped(event)
+ {
+ this._stopDisablingBreakpointsTemporarily();
+ }
+
</ins><span class="cx"> _mainResourceDidChange(event)
</span><span class="cx"> {
</span><span class="cx"> if (!event.target.isMainFrame())
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (201098 => 201099)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-18 20:42:20 UTC (rev 201098)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2016-05-18 21:04:27 UTC (rev 201099)
</span><span class="lines">@@ -46,8 +46,8 @@
</span><span class="cx"> WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange, this._debuggerActiveCallFrameDidChange, this);
</span><span class="cx"> WebInspector.debuggerManager.addEventListener(WebInspector.DebuggerManager.Event.WaitingToPause, this._debuggerWaitingToPause, this);
</span><span class="cx">
</span><del>- WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingWillStart, this._timelineRecordingWillStart, this);
- WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._timelineRecordingStopped, this);
</del><ins>+ WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingWillStart, this._timelineCapturingWillStart, this);
+ WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.CapturingStopped, this._timelineCapturingStopped, this);
</ins><span class="cx">
</span><span class="cx"> this._timelineRecordingWarningElement = document.createElement("div");
</span><span class="cx"> this._timelineRecordingWarningElement.classList.add("timeline-recording-warning");
</span><span class="lines">@@ -429,23 +429,16 @@
</span><span class="cx"> this._addIssuesForSourceCode(resource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _timelineRecordingWillStart(event)
</del><ins>+ _timelineCapturingWillStart(event)
</ins><span class="cx"> {
</span><del>- WebInspector.debuggerManager.startDisablingBreakpointsTemporarily();
-
- if (WebInspector.debuggerManager.paused)
- WebInspector.debuggerManager.resume();
-
</del><span class="cx"> this._debuggerBreakpointsButtonItem.enabled = false;
</span><span class="cx"> this._debuggerPauseResumeButtonItem.enabled = false;
</span><span class="cx">
</span><span class="cx"> this.contentView.element.insertBefore(this._timelineRecordingWarningElement, this.contentView.element.firstChild);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _timelineRecordingStopped(event)
</del><ins>+ _timelineCapturingStopped(event)
</ins><span class="cx"> {
</span><del>- WebInspector.debuggerManager.stopDisablingBreakpointsTemporarily();
-
</del><span class="cx"> this._debuggerBreakpointsButtonItem.enabled = true;
</span><span class="cx"> this._debuggerPauseResumeButtonItem.enabled = true;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>