<!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>[183341] 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/183341">183341</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:27:03 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Make JSContext debugging work with Tabs UI
https://bugs.webkit.org/show_bug.cgi?id=144203
Reviewed by Joseph Pecoraro.
* UserInterface/Base/Main.js:
(WebInspector.contentLoaded):
(WebInspector._isTabTypeAllowed):
(WebInspector.activateExtraDomains):
(WebInspector._updateReloadToolbarButton):
(WebInspector._updateDownloadToolbarButton):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183340 => 183341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:26:41 UTC (rev 183340)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-26 01:27:03 UTC (rev 183341)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-04-25 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Make JSContext debugging work with Tabs UI
+ https://bugs.webkit.org/show_bug.cgi?id=144203
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.contentLoaded):
+ (WebInspector._isTabTypeAllowed):
+ (WebInspector.activateExtraDomains):
+ (WebInspector._updateReloadToolbarButton):
+ (WebInspector._updateDownloadToolbarButton):
+
+2015-04-25 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Web Inspector: Save and restore tab state on reload and between sessions
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144202
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (183340 => 183341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:26:41 UTC (rev 183340)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-26 01:27:03 UTC (rev 183341)
</span><span class="lines">@@ -274,6 +274,7 @@
</span><span class="cx"> this._downloadToolbarButton = new WebInspector.ButtonToolbarItem("download", WebInspector.UIString("Download Web Archive"), null, "Images/DownloadArrow.svg");
</span><span class="cx"> this._downloadToolbarButton.addEventListener(WebInspector.ButtonNavigationItem.Event.Clicked, this._downloadWebArchive, this);
</span><span class="cx">
</span><ins>+ this._updateReloadToolbarButton();
</ins><span class="cx"> this._updateDownloadToolbarButton();
</span><span class="cx">
</span><span class="cx"> // The toolbar button for node inspection.
</span><span class="lines">@@ -325,7 +326,14 @@
</span><span class="cx"> this._updateDockNavigationItems();
</span><span class="cx"> this._updateToolbarHeight();
</span><span class="cx">
</span><ins>+ this._pendingOpenTabTypes = [];
+
</ins><span class="cx"> for (var tabType of this._openTabsSetting.value) {
</span><ins>+ if (!this._isTabTypeAllowed(tabType)) {
+ this._pendingOpenTabTypes.push(tabType);
+ continue;
+ }
+
</ins><span class="cx"> var tabContentView = this._tabContentViewForType(tabType);
</span><span class="cx"> if (!tabContentView)
</span><span class="cx"> continue;
</span><span class="lines">@@ -361,6 +369,18 @@
</span><span class="cx"> this.runBootstrapOperations();
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._isTabTypeAllowed = function(tabType)
+{
+ switch (tabType) {
+ case WebInspector.ElementsTabContentView.Type:
+ return !!window.DOMAgent;
+ case WebInspector.TimelineTabContentView.Type:
+ return !!window.TimelineAgent;
+ }
+
+ return true;
+};
+
</ins><span class="cx"> WebInspector._tabContentViewForType = function(tabType)
</span><span class="cx"> {
</span><span class="cx"> switch (tabType) {
</span><span class="lines">@@ -411,6 +431,27 @@
</span><span class="cx"> this.notifications.dispatchEventToListeners(WebInspector.Notification.ExtraDomainsActivated, {"domains": domains});
</span><span class="cx">
</span><span class="cx"> WebInspector.CSSCompletions.requestCSSNameCompletions();
</span><ins>+
+ this._updateReloadToolbarButton();
+ this._updateDownloadToolbarButton();
+
+ var stillPendingOpenTabTypes = [];
+ for (var tabType of this._pendingOpenTabTypes) {
+ if (!this._isTabTypeAllowed(tabType)) {
+ stillPendingOpenTabTypes.push(tabType);
+ continue;
+ }
+
+ var tabContentView = this._tabContentViewForType(tabType);
+ if (!tabContentView)
+ continue;
+
+ this.tabBrowser.addTabForContentView(tabContentView, true);
+
+ tabContentView.restoreStateFromCookie();
+ }
+
+ this._pendingOpenTabTypes = stillPendingOpenTabTypes;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WebInspector.contentBrowserTreeElementForRepresentedObject = function(contentBrowser, representedObject)
</span><span class="lines">@@ -1387,9 +1428,19 @@
</span><span class="cx"> PageAgent.reload(true);
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WebInspector._updateReloadToolbarButton = function()
+{
+ if (!window.PageAgent || !PageAgent.reload) {
+ this._reloadToolbarButton.hidden = true;
+ return;
+ }
+
+ this._reloadToolbarButton.hidden = false;
+};
+
</ins><span class="cx"> WebInspector._updateDownloadToolbarButton = function()
</span><span class="cx"> {
</span><del>- if (!PageAgent.archive || this.debuggableType !== WebInspector.DebuggableType.Web) {
</del><ins>+ if (!window.PageAgent || !PageAgent.archive || this.debuggableType !== WebInspector.DebuggableType.Web) {
</ins><span class="cx"> this._downloadToolbarButton.hidden = true;
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>