<!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>[183340] 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/183340">183340</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:26:41 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Save and restore tab state on reload and between sessions
https://bugs.webkit.org/show_bug.cgi?id=144202
Reviewed by Joseph Pecoraro.
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
(WebInspector._mainResourceDidChange):
(WebInspector._provisionalLoadStarted):
(WebInspector._restoreCookieForOpenTabs):
(WebInspector._saveCookieForOpenTabs):
(WebInspector._pageHidden):
* UserInterface/Views/TabContentView.js:
(WebInspector.TabContentView):
(WebInspector.TabContentView.prototype.restoreStateFromCookie):
(WebInspector.TabContentView.prototype.saveStateToCookie):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceBaseMainjs">trunk/Source/WebInspectorUI/UserInterface/Base/Main.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183339 => 183340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:26:06 UTC (rev 183339)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:26:41 UTC (rev 183340)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-04-25 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Save and restore tab state on reload and between sessions
+ https://bugs.webkit.org/show_bug.cgi?id=144202
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector._mainResourceDidChange):
+ (WebInspector._provisionalLoadStarted):
+ (WebInspector._restoreCookieForOpenTabs):
+ (WebInspector._saveCookieForOpenTabs):
+ (WebInspector._pageHidden):
+ * UserInterface/Views/TabContentView.js:
+ (WebInspector.TabContentView):
+ (WebInspector.TabContentView.prototype.restoreStateFromCookie):
+ (WebInspector.TabContentView.prototype.saveStateToCookie):
+
+2015-04-25 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Web Inspector: Split search from ResourceSidebarPanel into a Search tab and sidebar
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144197
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (183339 => 183340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:26:06 UTC (rev 183339)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:26:41 UTC (rev 183340)
</span><span class="lines">@@ -332,6 +332,8 @@
</span><span class="cx"> this.tabBrowser.addTabForContentView(tabContentView, true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ this._restoreCookieForOpenTabs();
+
</ins><span class="cx"> this.tabBar.selectedTabBarItem = this._selectedTabIndexSetting.value;
</span><span class="cx">
</span><span class="cx"> if (!this.tabBar.selectedTabBarItem)
</span><span class="lines">@@ -997,6 +999,8 @@
</span><span class="cx">
</span><span class="cx"> this._inProvisionalLoad = false;
</span><span class="cx">
</span><ins>+ this._restoreCookieForOpenTabs();
+
</ins><span class="cx"> this._updateDownloadToolbarButton();
</span><span class="cx">
</span><span class="cx"> this.updateWindowTitle();
</span><span class="lines">@@ -1007,9 +1011,27 @@
</span><span class="cx"> if (!event.target.isMainFrame())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ this._saveCookieForOpenTabs();
+
</ins><span class="cx"> this._inProvisionalLoad = true;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._restoreCookieForOpenTabs = function(causedByReload)
+{
+ for (var tabBarItem of this.tabBar.tabBarItems) {
+ var tabContentView = tabBarItem.representedObject;
+ tabContentView.restoreStateFromCookie(causedByReload);
+ }
+};
+
+WebInspector._saveCookieForOpenTabs = function()
+{
+ for (var tabBarItem of this.tabBar.tabBarItems) {
+ var tabContentView = tabBarItem.representedObject;
+ tabContentView.saveStateToCookie();
+ }
+};
+
</ins><span class="cx"> WebInspector._windowFocused = function(event)
</span><span class="cx"> {
</span><span class="cx"> if (event.target.document.nodeType !== Node.DOCUMENT_NODE || this.docked)
</span><span class="lines">@@ -1065,7 +1087,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._pageHidden = function(event)
</span><span class="cx"> {
</span><del>- // FIXME: Save inspector state.
</del><ins>+ this._saveCookieForOpenTabs();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector._undock = function(event)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js (183339 => 183340)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2015-04-26 01:26:06 UTC (rev 183339)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TabContentView.js 2015-04-26 01:26:41 UTC (rev 183340)
</span><span class="lines">@@ -49,6 +49,8 @@
</span><span class="cx">
</span><span class="cx"> this._detailsSidebarCollapsedSetting = new WebInspector.Setting(identifier + "-details-sidebar-collapsed", true);
</span><span class="cx"> this._detailsSidebarSelectedPanelSetting = new WebInspector.Setting(identifier + "-details-sidebar-selected-panel", null);
</span><ins>+
+ this._cookieSetting = new WebInspector.Setting(identifier + "-tab-cookie", {});
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.TabContentView.prototype = {
</span><span class="lines">@@ -105,6 +107,28 @@
</span><span class="cx"> return false;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ restoreStateFromCookie: function(causedByReload)
+ {
+ if (!this.navigationSidebarPanel)
+ return;
+
+ var matchTypeOnlyDelayForReload = 2000;
+ var matchTypeOnlyDelayForReopen = 1000;
+
+ var relaxMatchDelay = causedByReload ? matchTypeOnlyDelayForReload : matchTypeOnlyDelayForReopen;
+ this.navigationSidebarPanel.restoreStateFromCookie(this._cookieSetting.value || {}, relaxMatchDelay);
+ },
+
+ saveStateToCookie: function()
+ {
+ if (!this.navigationSidebarPanel)
+ return;
+
+ var cookie = this._cookieSetting.value || {};
+ this.navigationSidebarPanel.saveStateToCookie(cookie);
+ this._cookieSetting.value = cookie;
+ },
+
</ins><span class="cx"> get navigationSidebarPanel()
</span><span class="cx"> {
</span><span class="cx"> return this._navigationSidebarPanel;
</span></span></pre>
</div>
</div>
</body>
</html>