<!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>[193214] branches/safari-601-branch/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/193214">193214</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 10:58:20 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/189816">r189816</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193213 => 193214)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:58:15 UTC (rev 193213)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:58:20 UTC (rev 193214)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-02 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189816. rdar://problem/23221163
+
+ 2015-09-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Watch Expressions uncaught exceptions on page reload
+ https://bugs.webkit.org/show_bug.cgi?id=149150
+
+ Reviewed by Brian Burg.
+
+ Instead of waiting 50ms to Resume, when the page navigates
+ Resume immediately. This ensures nobody is using a stale
+ activeCallFrame after the navigation.
+
+ Also clean up the manager a bit by removing some deletes.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.restoreBreakpointsSoon):
+ (WebInspector.DebuggerManager.prototype.reset):
+ (WebInspector.DebuggerManager.prototype.debuggerDidPause):
+ (WebInspector.DebuggerManager.prototype.debuggerDidResume):
+ (WebInspector.DebuggerManager.prototype._mainResourceDidChange):
+ (WebInspector.DebuggerManager.prototype._didResumeInternal):
+ (WebInspector.DebuggerManager.prototype._associateBreakpointsWithSourceCode):
+ (WebInspector.DebuggerManager.prototype.debuggerDidResume.delayedWork): Deleted.
+
+2015-12-02 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r189815. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-09-15 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceControllersDebuggerManagerjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js (193213 => 193214)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-03 18:58:15 UTC (rev 193213)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-03 18:58:20 UTC (rev 193214)
</span><span class="lines">@@ -38,6 +38,8 @@
</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.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
+
</ins><span class="cx"> window.addEventListener("pagehide", this._inspectorClosing.bind(this));
</span><span class="cx">
</span><span class="cx"> this._allExceptionsBreakpointEnabledSetting = new WebInspector.Setting("break-on-all-exceptions", false);
</span><span class="lines">@@ -76,7 +78,7 @@
</span><span class="cx"> this._restoringBreakpoints = true;
</span><span class="cx"> for (var cookie of this._breakpointsSetting.value)
</span><span class="cx"> this.addBreakpoint(new WebInspector.Breakpoint(cookie));
</span><del>- delete this._restoringBreakpoints;
</del><ins>+ this._restoringBreakpoints = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Ensure that all managers learn about restored breakpoints,
</span><span class="lines">@@ -443,7 +445,7 @@
</span><span class="cx"> breakpoint.sourceCodeLocation.sourceCode = null;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- delete this._ignoreBreakpointDisplayLocationDidChangeEvent;
</del><ins>+ this._ignoreBreakpointDisplayLocationDidChangeEvent = false;
</ins><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.ScriptsCleared);
</span><span class="cx">
</span><span class="lines">@@ -457,7 +459,7 @@
</span><span class="cx">
</span><span class="cx"> if (this._delayedResumeTimeout) {
</span><span class="cx"> clearTimeout(this._delayedResumeTimeout);
</span><del>- delete this._delayedResumeTimeout;
</del><ins>+ this._delayedResumeTimeout = undefined;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> var wasStillPaused = this._paused;
</span><span class="lines">@@ -497,22 +499,9 @@
</span><span class="cx"> {
</span><span class="cx"> // Called from WebInspector.DebuggerObserver.
</span><span class="cx">
</span><del>- function delayedWork()
- {
- delete this._delayedResumeTimeout;
-
- this._paused = false;
- this._callFrames = null;
- this._activeCallFrame = null;
-
- this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.Resumed);
- this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.CallFramesDidChange);
- this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange);
- }
-
</del><span class="cx"> // We delay clearing the state and firing events so the user interface does not flash
</span><span class="cx"> // between brief steps or successive breakpoints.
</span><del>- this._delayedResumeTimeout = setTimeout(delayedWork.bind(this), 50);
</del><ins>+ this._delayedResumeTimeout = setTimeout(this._didResumeInternal.bind(this), 50);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> playBreakpointActionSound(breakpointActionIdentifier)
</span><span class="lines">@@ -810,6 +799,33 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _mainResourceDidChange(event)
+ {
+ if (!event.target.isMainFrame())
+ return;
+
+ this._didResumeInternal();
+ }
+
+ _didResumeInternal()
+ {
+ if (!this._activeCallFrame)
+ return;
+
+ if (this._delayedResumeTimeout) {
+ clearTimeout(this._delayedResumeTimeout);
+ this._delayedResumeTimeout = undefined;
+ }
+
+ this._paused = false;
+ this._callFrames = null;
+ this._activeCallFrame = null;
+
+ this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.Resumed);
+ this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.CallFramesDidChange);
+ this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.ActiveCallFrameDidChange);
+ }
+
</ins><span class="cx"> _updateBreakOnExceptionsState()
</span><span class="cx"> {
</span><span class="cx"> var state = "none";
</span><span class="lines">@@ -871,7 +887,7 @@
</span><span class="cx"> console.assert(breakpoint.sourceCodeLocation.sourceCode === sourceCode || breakpoint.sourceCodeLocation.sourceCode.url === sourceCode.url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- delete this._ignoreBreakpointDisplayLocationDidChangeEvent;
</del><ins>+ this._ignoreBreakpointDisplayLocationDidChangeEvent = false;
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>