<!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>[183375] 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/183375">183375</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-26 18:24:37 -0700 (Sun, 26 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Don't use treeElement.revealAndSelect when showing a default content view
https://bugs.webkit.org/show_bug.cgi?id=144239
Using revealAndSelect will end up calling WebInspector.showRepresentedObject. That is not bad
is most cases, but if the select tab supports the same represented object, it can end up showing
the content view in the wrong tab.
Reviewed by Darin Adler.
* UserInterface/Views/ContentBrowserTabContentView.js:
(WebInspector.ContentBrowserTabContentView.prototype._revealAndSelectRepresentedObjectInNavigationSidebar):
* UserInterface/Views/DebuggerSidebarPanel.js:
(WebInspector.DebuggerSidebarPanel.prototype.showDefaultContentView):
* UserInterface/Views/NavigationSidebarPanel.js:
(WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement):
(WebInspector.NavigationSidebarPanel.prototype._checkElementsForPendingViewStateCookie):
(WebInspector.NavigationSidebarPanel):
(WebInspector.NavigationSidebarPanel.prototype.showContentViewForCurrentSelection): Deleted.
* UserInterface/Views/ResourceSidebarPanel.js:
(WebInspector.ResourceSidebarPanel.prototype.showDefaultContentView):
(WebInspector.ResourceSidebarPanel.prototype._mainFrameDidChange):
(WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange.delayedWork):
(WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183374 => 183375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-27 00:33:48 UTC (rev 183374)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-27 01:24:37 UTC (rev 183375)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-04-26 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Don't use treeElement.revealAndSelect when showing a default content view
+ https://bugs.webkit.org/show_bug.cgi?id=144239
+
+ Using revealAndSelect will end up calling WebInspector.showRepresentedObject. That is not bad
+ is most cases, but if the select tab supports the same represented object, it can end up showing
+ the content view in the wrong tab.
+
+ Reviewed by Darin Adler.
+
+ * UserInterface/Views/ContentBrowserTabContentView.js:
+ (WebInspector.ContentBrowserTabContentView.prototype._revealAndSelectRepresentedObjectInNavigationSidebar):
+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype.showDefaultContentView):
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement):
+ (WebInspector.NavigationSidebarPanel.prototype._checkElementsForPendingViewStateCookie):
+ (WebInspector.NavigationSidebarPanel):
+ (WebInspector.NavigationSidebarPanel.prototype.showContentViewForCurrentSelection): Deleted.
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype.showDefaultContentView):
+ (WebInspector.ResourceSidebarPanel.prototype._mainFrameDidChange):
+ (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange.delayedWork):
+ (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange):
+
</ins><span class="cx"> 2015-04-26 Jono Wells <jonowells@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Vertically misaligned text in Object Trees
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js (183374 => 183375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-04-27 00:33:48 UTC (rev 183374)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-04-27 01:24:37 UTC (rev 183375)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> var treeElement = this.navigationSidebarPanel.treeElementForRepresentedObject(representedObject);
</span><span class="cx">
</span><span class="cx"> if (treeElement)
</span><del>- treeElement.revealAndSelect(true, false, false, true);
</del><ins>+ treeElement.revealAndSelect(true, false, true, true);
</ins><span class="cx"> else if (this.navigationSidebarPanel.contentTreeOutline.selectedTreeElement)
</span><span class="cx"> this.navigationSidebarPanel.contentTreeOutline.selectedTreeElement.deselect(true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js (183374 => 183375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-04-27 00:33:48 UTC (rev 183374)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerSidebarPanel.js 2015-04-27 01:24:37 UTC (rev 183375)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> var currentTreeElement = this._contentTreeOutline.children[0];
</span><span class="cx"> while (currentTreeElement && !currentTreeElement.root) {
</span><span class="cx"> if (currentTreeElement instanceof WebInspector.ResourceTreeElement || currentTreeElement instanceof WebInspector.ScriptTreeElement) {
</span><del>- currentTreeElement.revealAndSelect();
</del><ins>+ this.showDefaultContentViewForTreeElement(currentTreeElement);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNavigationSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js (183374 => 183375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-04-27 00:33:48 UTC (rev 183374)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NavigationSidebarPanel.js 2015-04-27 01:24:37 UTC (rev 183375)
</span><span class="lines">@@ -173,12 +173,14 @@
</span><span class="cx"> // Implemneted by subclasses if needed to show a content view when no existing tree element is selected.
</span><span class="cx"> }
</span><span class="cx">
</span><del>- showContentViewForCurrentSelection()
</del><ins>+ showDefaultContentViewForTreeElement(treeElement)
</ins><span class="cx"> {
</span><del>- // Reselect the selected tree element to cause the content view to be shown as well. <rdar://problem/10854727>
- var selectedTreeElement = this._contentTreeOutline.selectedTreeElement;
- if (selectedTreeElement)
- selectedTreeElement.select();
</del><ins>+ console.assert(treeElement);
+ console.assert(treeElement.representedObject);
+ if (!treeElement || !treeElement.representedObject)
+ return;
+ this.contentBrowser.showContentViewForRepresentedObject(treeElement.representedObject);
+ treeElement.revealAndSelect(true, false, true, true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> saveStateToCookie(cookie)
</span><span class="lines">@@ -688,7 +690,7 @@
</span><span class="cx"> }, this);
</span><span class="cx">
</span><span class="cx"> if (matchedElement) {
</span><del>- matchedElement.revealAndSelect();
</del><ins>+ this.showDefaultContentViewForTreeElement(matchedElement);
</ins><span class="cx">
</span><span class="cx"> delete this._pendingViewStateCookie;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsResourceSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js (183374 => 183375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-04-27 00:33:48 UTC (rev 183374)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js 2015-04-27 01:24:37 UTC (rev 183375)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> var firstTreeElement = this.contentTreeOutline.children[0];
</span><span class="cx"> if (firstTreeElement)
</span><del>- firstTreeElement.revealAndSelect();
</del><ins>+ this.showDefaultContentViewForTreeElement(firstTreeElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> treeElementForRepresentedObject(representedObject)
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> var treeElement = currentContentView ? this.treeElementForRepresentedObject(currentContentView.representedObject) : null;
</span><span class="cx"> if (!treeElement)
</span><span class="cx"> treeElement = this._mainFrameTreeElement;
</span><del>- treeElement.revealAndSelect(true, false, !!currentContentView, true);
</del><ins>+ this.showDefaultContentViewForTreeElement(treeElement);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> if (!this.contentBrowser.currentContentView || wasShowingResourceContentView) {
</span><span class="cx"> // NOTE: This selection, during provisional loading, won't be saved, so it is
</span><span class="cx"> // safe to do and not-clobber cookie restoration.
</span><del>- this._mainFrameTreeElement.revealAndSelect(true, false);
</del><ins>+ this.showDefaultContentViewForTreeElement(this._mainFrameTreeElement);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>