<!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>[193339] 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/193339">193339</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:12:25 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192771">r192771</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 (193338 => 193339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:12:20 UTC (rev 193338)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 19:12:25 UTC (rev 193339)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192771. rdar://problem/23221163
+
+ 2015-11-24 Brian Burg <bburg@apple.com>
+
+ Web Inspector: save Inspector's breakpoints to localStorage whenever they are modified
+ https://bugs.webkit.org/show_bug.cgi?id=151581
+
+ Reviewed by Timothy Hatcher.
+
+ Serialize all breakpoints to the "breakpoints" Setting in local storage
+ whenever any breakpoint model object is added, removed, or modified.
+
+ Remove the old listener that attempted to save breakpoints on the
+ pagehide event. It did not fire in important scenarios like exiting
+ the browser via Cmd-Q or killing the process via Ctrl-C / SIGKILL.
+
+ This is not expected to be a performance problem because most people
+ do not keep thousands of breakpoints active, and breakpoints are not
+ set very often. If it's a problem, we can mitigate it with coalescing.
+
+ * UserInterface/Controllers/DebuggerManager.js:
+ (WebInspector.DebuggerManager.prototype.addBreakpoint):
+ (WebInspector.DebuggerManager.prototype.removeBreakpoint):
+ (WebInspector.DebuggerManager.prototype._breakpointDisabledStateDidChange):
+ (WebInspector.DebuggerManager.prototype._saveBreakpoints):
+ (WebInspector.DebuggerManager.prototype._inspectorClosing): Deleted.
+
+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192764. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-11-24 Brian Burg <bburg@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 (193338 => 193339)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-03 19:12:20 UTC (rev 193338)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/DebuggerManager.js 2015-12-03 19:12:25 UTC (rev 193339)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.Frame.addEventListener(WebInspector.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
</span><span class="cx">
</span><del>- window.addEventListener("pagehide", this._inspectorClosing.bind(this));
-
</del><span class="cx"> this._allExceptionsBreakpointEnabledSetting = new WebInspector.Setting("break-on-all-exceptions", false);
</span><span class="cx"> this._allUncaughtExceptionsBreakpointEnabledSetting = new WebInspector.Setting("break-on-all-uncaught-exceptions", false);
</span><span class="cx">
</span><span class="lines">@@ -362,6 +360,8 @@
</span><span class="cx"> if (!breakpoint.disabled)
</span><span class="cx"> this._setBreakpoint(breakpoint, shouldSpeculativelyResolve ? speculativelyResolveBreakpoint.bind(null, breakpoint) : null);
</span><span class="cx">
</span><ins>+ this._saveBreakpoints();
+
</ins><span class="cx"> if (!skipEventDispatch)
</span><span class="cx"> this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.BreakpointAdded, {breakpoint});
</span><span class="cx"> }
</span><span class="lines">@@ -403,6 +403,8 @@
</span><span class="cx"> breakpoint.disabled = true;
</span><span class="cx"> breakpoint.clearActions();
</span><span class="cx">
</span><ins>+ this._saveBreakpoints();
+
</ins><span class="cx"> this.dispatchEventToListeners(WebInspector.DebuggerManager.Event.BreakpointRemoved, {breakpoint});
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -764,8 +766,9 @@
</span><span class="cx">
</span><span class="cx"> _breakpointDisabledStateDidChange(event)
</span><span class="cx"> {
</span><del>- var breakpoint = event.target;
</del><ins>+ this._saveBreakpoints();
</ins><span class="cx">
</span><ins>+ var breakpoint = event.target;
</ins><span class="cx"> if (breakpoint === this._allExceptionsBreakpoint) {
</span><span class="cx"> if (!breakpoint.disabled)
</span><span class="cx"> this.breakpointsEnabled = true;
</span><span class="lines">@@ -790,6 +793,8 @@
</span><span class="cx">
</span><span class="cx"> _breakpointEditablePropertyDidChange(event)
</span><span class="cx"> {
</span><ins>+ this._saveBreakpoints();
+
</ins><span class="cx"> var breakpoint = event.target;
</span><span class="cx"> if (breakpoint.disabled)
</span><span class="cx"> return;
</span><span class="lines">@@ -862,26 +867,14 @@
</span><span class="cx"> DebuggerAgent.setPauseOnExceptions(state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _inspectorClosing(event)
- {
- this._saveBreakpoints();
- }
-
</del><span class="cx"> _saveBreakpoints()
</span><span class="cx"> {
</span><del>- var savedBreakpoints = [];
</del><ins>+ if (this._restoringBreakpoints)
+ return;
</ins><span class="cx">
</span><del>- for (var i = 0; i < this._breakpoints.length; ++i) {
- var breakpoint = this._breakpoints[i];
-
- // Only breakpoints with URLs can be saved. Breakpoints for transient scripts can't.
- if (!breakpoint.url)
- continue;
-
- savedBreakpoints.push(breakpoint.info);
- }
-
- this._breakpointsSetting.value = savedBreakpoints;
</del><ins>+ var breakpointsToSave = this._breakpoints.filter((breakpoint) => !!breakpoint.url);
+ var serializedBreakpoints = breakpointsToSave.map((breakpoint) => breakpoint.info);
+ this._breakpointsSetting.value = serializedBreakpoints;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> _associateBreakpointsWithSourceCode(breakpoints, sourceCode)
</span></span></pre>
</div>
</div>
</body>
</html>