<!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>[183642] 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/183642">183642</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-04-30 13:03:57 -0700 (Thu, 30 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Scope Chain sidebar should be selected immediately when paused
https://bugs.webkit.org/show_bug.cgi?id=144352
Reviewed by Joseph Pecoraro.
* UserInterface/Base/Main.js:
(WebInspector.showDebuggerTab): Added showScopeChainDetailsSidebarPanel argument.
(WebInspector._debuggerDidPause): Pass true for showScopeChainDetailsSidebarPanel.
* UserInterface/Views/ContentBrowserTabContentView.js:
(WebInspector.ContentBrowserTabContentView): Wire the event to showDetailsSidebarPanels instead of
_contentBrowserRepresentedObjectsDidChange, allowing subclasses to do work during the event.
(WebInspector.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels): Moved content of
_contentBrowserRepresentedObjectsDidChange here.
(WebInspector.ContentBrowserTabContentView.prototype._contentBrowserRepresentedObjectsDidChange): Deleted.
* UserInterface/Views/DebuggerTabContentView.js:
(WebInspector.DebuggerTabContentView.prototype.showDetailsSidebarPanels): Added. Show the scope sidebar panel
if it is available and it was requested by showScopeChainDetailsSidebarPanel().
(WebInspector.DebuggerTabContentView.prototype.showScopeChainDetailsSidebarPanel): Added.</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="#trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (183641 => 183642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2015-04-30 20:01:18 UTC (rev 183641)
+++ trunk/Source/WebInspectorUI/ChangeLog 2015-04-30 20:03:57 UTC (rev 183642)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-04-30 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: Scope Chain sidebar should be selected immediately when paused
+ https://bugs.webkit.org/show_bug.cgi?id=144352
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.showDebuggerTab): Added showScopeChainDetailsSidebarPanel argument.
+ (WebInspector._debuggerDidPause): Pass true for showScopeChainDetailsSidebarPanel.
+ * UserInterface/Views/ContentBrowserTabContentView.js:
+ (WebInspector.ContentBrowserTabContentView): Wire the event to showDetailsSidebarPanels instead of
+ _contentBrowserRepresentedObjectsDidChange, allowing subclasses to do work during the event.
+ (WebInspector.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels): Moved content of
+ _contentBrowserRepresentedObjectsDidChange here.
+ (WebInspector.ContentBrowserTabContentView.prototype._contentBrowserRepresentedObjectsDidChange): Deleted.
+ * UserInterface/Views/DebuggerTabContentView.js:
+ (WebInspector.DebuggerTabContentView.prototype.showDetailsSidebarPanels): Added. Show the scope sidebar panel
+ if it is available and it was requested by showScopeChainDetailsSidebarPanel().
+ (WebInspector.DebuggerTabContentView.prototype.showScopeChainDetailsSidebarPanel): Added.
+
</ins><span class="cx"> 2015-04-30 Andres Gomez <agomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Web Inspector: New Images for ObjectTreeView - Setter
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceBaseMainjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (183641 => 183642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-30 20:01:18 UTC (rev 183641)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2015-04-30 20:03:57 UTC (rev 183642)
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx"> this.tabBrowser.showTabForContentView(tabContentView);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WebInspector.showDebuggerTab = function(breakpointToSelect)
</del><ins>+WebInspector.showDebuggerTab = function(breakpointToSelect, showScopeChainDetailsSidebarPanel)
</ins><span class="cx"> {
</span><span class="cx"> var tabContentView = this.tabBrowser.bestTabContentViewForClass(WebInspector.DebuggerTabContentView);
</span><span class="cx"> if (!tabContentView)
</span><span class="lines">@@ -747,6 +747,9 @@
</span><span class="cx"> if (breakpointToSelect instanceof WebInspector.Breakpoint)
</span><span class="cx"> tabContentView.revealAndSelectBreakpoint(breakpointToSelect);
</span><span class="cx">
</span><ins>+ if (showScopeChainDetailsSidebarPanel)
+ tabContentView.showScopeChainDetailsSidebarPanel();
+
</ins><span class="cx"> this.tabBrowser.showTabForContentView(tabContentView);
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -1068,7 +1071,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector._debuggerDidPause = function(event)
</span><span class="cx"> {
</span><del>- this.showDebuggerTab();
</del><ins>+ this.showDebuggerTab(null, true);
</ins><span class="cx">
</span><span class="cx"> this._dashboardContainer.showDashboardViewForRepresentedObject(this.dashboardManager.dashboards.debugger);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsContentBrowserTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js (183641 => 183642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-04-30 20:01:18 UTC (rev 183641)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ContentBrowserTabContentView.js 2015-04-30 20:03:57 UTC (rev 183642)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> this._lastSelectedDetailsSidebarPanelSetting = new WebInspector.Setting(identifier + "-last-selected-details-sidebar-panel", null);
</span><span class="cx">
</span><span class="cx"> this._contentBrowser = contentBrowser;
</span><del>- this._contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentRepresentedObjectsDidChange, this._contentBrowserRepresentedObjectsDidChange, this);
</del><ins>+ this._contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentRepresentedObjectsDidChange, this.showDetailsSidebarPanels, this);
</ins><span class="cx"> this._contentBrowser.addEventListener(WebInspector.ContentBrowser.Event.CurrentContentViewDidChange, this._contentBrowserCurrentContentViewDidChange, this);
</span><span class="cx">
</span><span class="cx"> if (navigationSidebarPanel) {
</span><span class="lines">@@ -128,62 +128,9 @@
</span><span class="cx">
</span><span class="cx"> showDetailsSidebarPanels: function()
</span><span class="cx"> {
</span><del>- this._contentBrowserRepresentedObjectsDidChange();
- },
-
- showRepresentedObject: function(representedObject, cookie)
- {
- this.contentBrowser.showContentViewForRepresentedObject(representedObject, cookie);
- },
-
- // ContentBrowser Delegate
-
- contentBrowserTreeElementForRepresentedObject: function(contentBrowser, representedObject)
- {
- if (this.navigationSidebarPanel)
- return this.navigationSidebarPanel.treeElementForRepresentedObject(representedObject);
- return null;
- },
-
- // Private
-
- _navigationSidebarCollapsedStateDidChange: function(event)
- {
- this._showNavigationSidebarItem.activated = !WebInspector.navigationSidebar.collapsed;
- },
-
- _detailsSidebarCollapsedStateDidChange: function(event)
- {
</del><span class="cx"> if (!this.visible)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- this._showDetailsSidebarItem.activated = !WebInspector.detailsSidebar.collapsed;
- this._showDetailsSidebarItem.enabled = WebInspector.detailsSidebar.sidebarPanels.length;
-
- if (this._ignoreDetailsSidebarPanelCollapsedEvent)
- return;
-
- this.detailsSidebarCollapsedSetting.value = WebInspector.detailsSidebar.collapsed;
- },
-
- _detailsSidebarPanelSelected: function(event)
- {
- if (!this.visible)
- return;
-
- this._showDetailsSidebarItem.enabled = WebInspector.detailsSidebar.sidebarPanels.length;
-
- if (!WebInspector.detailsSidebar.selectedSidebarPanel || this._ignoreDetailsSidebarPanelSelectedEvent)
- return;
-
- this._lastSelectedDetailsSidebarPanelSetting.value = WebInspector.detailsSidebar.selectedSidebarPanel.identifier;
- },
-
- _contentBrowserRepresentedObjectsDidChange: function()
- {
- if (!this.visible)
- return;
-
</del><span class="cx"> var currentRepresentedObjects = this._contentBrowser.currentRepresentedObjects;
</span><span class="cx"> var currentSidebarPanels = WebInspector.detailsSidebar.sidebarPanels;
</span><span class="cx"> var wasSidebarEmpty = !currentSidebarPanels.length;
</span><span class="lines">@@ -231,6 +178,54 @@
</span><span class="cx"> this._showDetailsSidebarItem.enabled = WebInspector.detailsSidebar.sidebarPanels.length;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ showRepresentedObject: function(representedObject, cookie)
+ {
+ this.contentBrowser.showContentViewForRepresentedObject(representedObject, cookie);
+ },
+
+ // ContentBrowser Delegate
+
+ contentBrowserTreeElementForRepresentedObject: function(contentBrowser, representedObject)
+ {
+ if (this.navigationSidebarPanel)
+ return this.navigationSidebarPanel.treeElementForRepresentedObject(representedObject);
+ return null;
+ },
+
+ // Private
+
+ _navigationSidebarCollapsedStateDidChange: function(event)
+ {
+ this._showNavigationSidebarItem.activated = !WebInspector.navigationSidebar.collapsed;
+ },
+
+ _detailsSidebarCollapsedStateDidChange: function(event)
+ {
+ if (!this.visible)
+ return;
+
+ this._showDetailsSidebarItem.activated = !WebInspector.detailsSidebar.collapsed;
+ this._showDetailsSidebarItem.enabled = WebInspector.detailsSidebar.sidebarPanels.length;
+
+ if (this._ignoreDetailsSidebarPanelCollapsedEvent)
+ return;
+
+ this.detailsSidebarCollapsedSetting.value = WebInspector.detailsSidebar.collapsed;
+ },
+
+ _detailsSidebarPanelSelected: function(event)
+ {
+ if (!this.visible)
+ return;
+
+ this._showDetailsSidebarItem.enabled = WebInspector.detailsSidebar.sidebarPanels.length;
+
+ if (!WebInspector.detailsSidebar.selectedSidebarPanel || this._ignoreDetailsSidebarPanelSelectedEvent)
+ return;
+
+ this._lastSelectedDetailsSidebarPanelSetting.value = WebInspector.detailsSidebar.selectedSidebarPanel.identifier;
+ },
+
</ins><span class="cx"> _contentBrowserCurrentContentViewDidChange: function(event)
</span><span class="cx"> {
</span><span class="cx"> var currentContentView = this._contentBrowser.currentContentView;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDebuggerTabContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js (183641 => 183642)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-04-30 20:01:18 UTC (rev 183641)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DebuggerTabContentView.js 2015-04-30 20:03:57 UTC (rev 183642)
</span><span class="lines">@@ -56,6 +56,23 @@
</span><span class="cx"> return representedObject.type === WebInspector.Resource.Type.Document || representedObject.type === WebInspector.Resource.Type.Script;
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ showDetailsSidebarPanels: function()
+ {
+ WebInspector.ContentBrowserTabContentView.prototype.showDetailsSidebarPanels.call(this);
+
+ if (!this._showScopeChainDetailsSidebarPanel || !WebInspector.scopeChainDetailsSidebarPanel.parentSidebar)
+ return;
+
+ WebInspector.scopeChainDetailsSidebarPanel.show();
+
+ this._showScopeChainDetailsSidebarPanel = false;
+ },
+
+ showScopeChainDetailsSidebarPanel: function()
+ {
+ this._showScopeChainDetailsSidebarPanel = true;
+ },
+
</ins><span class="cx"> revealAndSelectBreakpoint: function(breakpoint)
</span><span class="cx"> {
</span><span class="cx"> console.assert(breakpoint instanceof WebInspector.Breakpoint);
</span></span></pre>
</div>
</div>
</body>
</html>