<!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>[171784] 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/171784">171784</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-07-29 20:48:54 -0700 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: breakpoints are always speculatively resolved when restored from local storage
https://bugs.webkit.org/show_bug.cgi?id=135396
Reviewed by Timothy Hatcher.
A longstanding quirk/optimization in the frontend is that we immediately set a breakpoint
as resolved if the breakpoint was successfully set in the backend. This ensures that clicking in
the gutter immediately produces a resolved breakpoint with only one round-trip.
However, not all breakpoints should be speculatively resolved, because the corresponding resource
may not be loaded yet. This situation causes problems for code that assumes a resolved breakpoint
also has a valid sourceCodeLocation.sourceCode.
* UserInterface/Controllers/DebuggerManager.js:
(WebInspector.DebuggerManager.restoreBreakpointsSoon): Don't leak the variable to global scope.
(WebInspector.DebuggerManager):
(WebInspector.DebuggerManager.prototype.speculativelyResolveBreakpoint):
(WebInspector.DebuggerManager.prototype.addBreakpoint): Speculatively resolve here if requested
using the success callback passed to _setBreakpoint.
(WebInspector.DebuggerManager.prototype.didSetBreakpoint): Emit simulated
Debugger.breakpointResolved events since they are only sent by the backend when a script is parsed.
(WebInspector.DebuggerManager.prototype._setBreakpoint):
* UserInterface/Views/SourceCodeTextEditor.js:
(WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointAdded): Request speculative resolve.</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="#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 (171783 => 171784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2014-07-30 00:30:52 UTC (rev 171783)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-07-30 03:48:54 UTC (rev 171784)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-07-29 Brian J. Burg <burg@cs.washington.edu>
+
+ Web Inspector: breakpoints are always speculatively resolved when restored from local storage
+ https://bugs.webkit.org/show_bug.cgi?id=135396
+
+ Reviewed by Timothy Hatcher.
+
+ A longstanding quirk/optimization in the frontend is that we immediately set a breakpoint
+ as resolved if the breakpoint was successfully set in the backend. This ensures that clicking in
+ the gutter immediately produces a resolved breakpoint with only one round-trip.
+
+ However, not all breakpoints should be speculatively resolved, because the corresponding resource
+ may not be loaded yet. This situation causes problems for code that assumes a resolved breakpoint
+ also has a valid sourceCodeLocation.sourceCode.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.restoreBreakpointsSoon): Don't leak the variable to global scope.
+ (WebInspector.DebuggerManager):
+ (WebInspector.DebuggerManager.prototype.speculativelyResolveBreakpoint):
+ (WebInspector.DebuggerManager.prototype.addBreakpoint): Speculatively resolve here if requested
+ using the success callback passed to _setBreakpoint.
+
+ (WebInspector.DebuggerManager.prototype.didSetBreakpoint): Emit simulated
+ Debugger.breakpointResolved events since they are only sent by the backend when a script is parsed.
+
+ (WebInspector.DebuggerManager.prototype._setBreakpoint):
+ * UserInterface/Views/SourceCodeTextEditor.js:
+ (WebInspector.SourceCodeTextEditor.prototype.textEditorBreakpointAdded): Request speculative resolve.
+
</ins><span class="cx"> 2014-07-29 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Eliminate more forced layouts during timeline recordings
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (171783 => 171784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2014-07-30 00:30:52 UTC (rev 171783)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2014-07-30 03:48:54 UTC (rev 171784)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> this._updateBreakOnExceptionsState();
</span><span class="cx">
</span><span class="cx"> function restoreBreakpointsSoon() {
</span><del>- for (cookie of this._breakpointsSetting.value)
</del><ins>+ for (var cookie of this._breakpointsSetting.value)
</ins><span class="cx"> this.addBreakpoint(new WebInspector.Breakpoint(cookie));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> DebuggerAgent.continueToLocation({scriptId: scriptIdentifier, lineNumber: lineNumber, columnNumber: columnNumber});
</span><span class="cx"> },
</span><span class="cx">
</span><del>- addBreakpoint: function(breakpoint, skipEventDispatch)
</del><ins>+ addBreakpoint: function(breakpoint, skipEventDispatch, shouldSpeculativelyResolve)
</ins><span class="cx"> {
</span><span class="cx"> console.assert(breakpoint instanceof WebInspector.Breakpoint, "Bad argument to DebuggerManger.addBreakpoint: ", breakpoint);
</span><span class="cx"> if (!breakpoint)
</span><span class="lines">@@ -249,8 +249,12 @@
</span><span class="cx">
</span><span class="cx"> this._breakpoints.push(breakpoint);
</span><span class="cx">
</span><ins>+ function speculativelyResolveBreakpoint(breakpoint) {
+ breakpoint.resolved = true;
+ }
+
</ins><span class="cx"> if (!breakpoint.disabled)
</span><del>- this._setBreakpoint(breakpoint);
</del><ins>+ this._setBreakpoint(breakpoint, shouldSpeculativelyResolve ? speculativelyResolveBreakpoint.bind(null, breakpoint) : null);
</ins><span class="cx">
</span><span class="cx"> if (!skipEventDispatch)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.BreakpointAdded, {breakpoint: breakpoint});
</span><span class="lines">@@ -524,7 +528,7 @@
</span><span class="cx"> // a multi-step process for the user that can be confusing.
</span><span class="cx"> this.breakpointsEnabled = true;
</span><span class="cx">
</span><del>- function didSetBreakpoint(error, breakpointIdentifier)
</del><ins>+ function didSetBreakpoint(error, breakpointIdentifier, locations)
</ins><span class="cx"> {
</span><span class="cx"> if (error)
</span><span class="cx"> return;
</span><span class="lines">@@ -532,8 +536,14 @@
</span><span class="cx"> this._breakpointIdMap[breakpointIdentifier] = breakpoint;
</span><span class="cx">
</span><span class="cx"> breakpoint.identifier = breakpointIdentifier;
</span><del>- breakpoint.resolved = true;
</del><span class="cx">
</span><ins>+ // Debugger.setBreakpoint returns a single location.
+ if (!(locations instanceof Array))
+ locations = [locations];
+
+ for (var location of locations)
+ this.breakpointResolved(breakpointIdentifier, location);
+
</ins><span class="cx"> if (typeof callback === "function")
</span><span class="cx"> callback();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsSourceCodeTextEditorjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js (171783 => 171784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2014-07-30 00:30:52 UTC (rev 171783)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/SourceCodeTextEditor.js 2014-07-30 03:48:54 UTC (rev 171784)
</span><span class="lines">@@ -839,7 +839,10 @@
</span><span class="cx"> this._addBreakpointWithEditorLineInfo(breakpoint, lineInfo);
</span><span class="cx">
</span><span class="cx"> this._ignoreBreakpointAddedBreakpoint = breakpoint;
</span><del>- WebInspector.debuggerManager.addBreakpoint(breakpoint);
</del><ins>+
+ var shouldSkipEventDispatch = false;
+ var shouldSpeculativelyResolveBreakpoint = true;
+ WebInspector.debuggerManager.addBreakpoint(breakpoint, shouldSkipEventDispatch, shouldSpeculativelyResolveBreakpoint);
</ins><span class="cx"> delete this._ignoreBreakpointAddedBreakpoint;
</span><span class="cx">
</span><span class="cx"> // Return the more accurate location and breakpoint info.
</span></span></pre>
</div>
</div>
</body>
</html>