<!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>[204513] 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/204513">204513</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-16 10:26:16 -0700 (Tue, 16 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Do not request Scope Chain lists if section is collapsed (mainly Global Variables)
https://bugs.webkit.org/show_bug.cgi?id=140567
<rdar://problem/19504745>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-08-16
Reviewed by Timothy Hatcher.
* UserInterface/Main.html:
New file name.
* UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
(WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshProperties.fillSection):
(WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshProperties):
Avoid fetching object properties until the user expands the section.
* UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
(WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateCallFramesSection):
(WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateWatchExpressionsSection):
Avoid fetching scope variable properties until the user expands the section.
* UserInterface/Views/ObjectPropertiesDetailSectionRow.js: Renamed from Source/WebInspectorUI/UserInterface/Views/DetailsSectionPropertiesRow.js.
(WebInspector.ObjectPropertiesDetailSectionRow):
(WebInspector.ObjectPropertiesDetailSectionRow.prototype.get objectTree):
(WebInspector.ObjectPropertiesDetailSectionRow.prototype._detailsSectionCollapsedStateChanged):
Rename and simplify the class since it always has an ObjectTreeView.
By default the section will auto-expand the ObjectTreeView, however
if provided a details section group, it will defer expanion until
the group expands.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceMainhtml">trunk/Source/WebInspectorUI/UserInterface/Main.html</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsObjectPropertiesDetailSectionRowjs">trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesDetailSectionRow.js</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionPropertiesRowjs">trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionPropertiesRow.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (204512 => 204513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-08-16 17:14:42 UTC (rev 204512)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-08-16 17:26:16 UTC (rev 204513)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-08-16 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Do not request Scope Chain lists if section is collapsed (mainly Global Variables)
+ https://bugs.webkit.org/show_bug.cgi?id=140567
+ <rdar://problem/19504745>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Main.html:
+ New file name.
+
+ * UserInterface/Views/DOMNodeDetailsSidebarPanel.js:
+ (WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshProperties.fillSection):
+ (WebInspector.DOMNodeDetailsSidebarPanel.prototype._refreshProperties):
+ Avoid fetching object properties until the user expands the section.
+
+ * UserInterface/Views/ScopeChainDetailsSidebarPanel.js:
+ (WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateCallFramesSection):
+ (WebInspector.ScopeChainDetailsSidebarPanel.prototype._generateWatchExpressionsSection):
+ Avoid fetching scope variable properties until the user expands the section.
+
+ * UserInterface/Views/ObjectPropertiesDetailSectionRow.js: Renamed from Source/WebInspectorUI/UserInterface/Views/DetailsSectionPropertiesRow.js.
+ (WebInspector.ObjectPropertiesDetailSectionRow):
+ (WebInspector.ObjectPropertiesDetailSectionRow.prototype.get objectTree):
+ (WebInspector.ObjectPropertiesDetailSectionRow.prototype._detailsSectionCollapsedStateChanged):
+ Rename and simplify the class since it always has an ObjectTreeView.
+ By default the section will auto-expand the ObjectTreeView, however
+ if provided a details section group, it will defer expanion until
+ the group expands.
+
</ins><span class="cx"> 2016-08-16 Devin Rousso <dcrousso+webkit@gmail.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: add "Copy Selected" context menu item to Console
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceMainhtml"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (204512 => 204513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2016-08-16 17:14:42 UTC (rev 204512)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2016-08-16 17:26:16 UTC (rev 204513)
</span><span class="lines">@@ -449,7 +449,6 @@
</span><span class="cx"> <script src="Views/DetailsSection.js"></script>
</span><span class="cx"> <script src="Views/DetailsSectionDataGridRow.js"></script>
</span><span class="cx"> <script src="Views/DetailsSectionGroup.js"></script>
</span><del>- <script src="Views/DetailsSectionPropertiesRow.js"></script>
</del><span class="cx"> <script src="Views/DetailsSectionSimpleRow.js"></script>
</span><span class="cx"> <script src="Views/DetailsSectionTextRow.js"></script>
</span><span class="cx">
</span><span class="lines">@@ -570,6 +569,7 @@
</span><span class="cx"> <script src="Views/NetworkTimelineOverviewGraph.js"></script>
</span><span class="cx"> <script src="Views/NetworkTimelineView.js"></script>
</span><span class="cx"> <script src="Views/ObjectPreviewView.js"></script>
</span><ins>+ <script src="Views/ObjectPropertiesDetailSectionRow.js"></script>
</ins><span class="cx"> <script src="Views/ObjectTreeArrayIndexTreeElement.js"></script>
</span><span class="cx"> <script src="Views/ObjectTreeMapEntryTreeElement.js"></script>
</span><span class="cx"> <script src="Views/ObjectTreePropertyTreeElement.js"></script>
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMNodeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js (204512 => 204513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2016-08-16 17:14:42 UTC (rev 204512)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMNodeDetailsSidebarPanel.js 2016-08-16 17:26:16 UTC (rev 204513)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> objectTree.showOnlyProperties();
</span><span class="cx">
</span><span class="cx"> var detailsSection = new WebInspector.DetailsSection(prototype.description.hash + "-prototype-properties", title, null, null, true);
</span><del>- detailsSection.groups[0].rows = [new WebInspector.DetailsSectionPropertiesRow(objectTree)];
</del><ins>+ detailsSection.groups[0].rows = [new WebInspector.ObjectPropertiesDetailSectionRow(objectTree, detailsSection)];
</ins><span class="cx">
</span><span class="cx"> element.appendChild(detailsSection.element);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionPropertiesRowjs"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionPropertiesRow.js (204512 => 204513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionPropertiesRow.js 2016-08-16 17:14:42 UTC (rev 204512)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionPropertiesRow.js 2016-08-16 17:26:16 UTC (rev 204513)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-WebInspector.DetailsSectionPropertiesRow = class DetailsSectionPropertiesRow extends WebInspector.DetailsSectionRow
-{
- constructor(propertiesSection, emptyMessage)
- {
- super(emptyMessage);
-
- this.element.classList.add("properties", WebInspector.SyntaxHighlightedStyleClassName);
-
- this.propertiesSection = propertiesSection;
- }
-
- // Public
-
- get propertiesSection()
- {
- return this._propertiesSection;
- }
-
- set propertiesSection(propertiesSection)
- {
- this._propertiesSection = propertiesSection || null;
-
- if (propertiesSection) {
- // Call expand to cause the section to populate.
- propertiesSection.expand();
-
- this.hideEmptyMessage();
- this.element.appendChild(propertiesSection.element);
- } else
- this.showEmptyMessage();
- }
-};
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsObjectPropertiesDetailSectionRowjsfromrev204512trunkSourceWebInspectorUIUserInterfaceViewsDetailsSectionPropertiesRowjs"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesDetailSectionRow.js (from rev 204512, trunk/Source/WebInspectorUI/UserInterface/Views/DetailsSectionPropertiesRow.js) (0 => 204513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesDetailSectionRow.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ObjectPropertiesDetailSectionRow.js 2016-08-16 17:26:16 UTC (rev 204513)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.ObjectPropertiesDetailSectionRow = class ObjectPropertiesDetailSectionRow extends WebInspector.DetailsSectionRow
+{
+ constructor(objectTree, sectionForDeferredExpand)
+ {
+ super();
+
+ console.assert(objectTree instanceof WebInspector.ObjectTreeView);
+ console.assert(!sectionForDeferredExpand || sectionForDeferredExpand instanceof WebInspector.DetailsSection);
+
+ this._objectTree = objectTree;
+
+ this.hideEmptyMessage();
+ this.element.classList.add("properties", WebInspector.SyntaxHighlightedStyleClassName);
+ this.element.appendChild(objectTree.element);
+
+ if (sectionForDeferredExpand && sectionForDeferredExpand.collapsed)
+ sectionForDeferredExpand.addEventListener(WebInspector.DetailsSection.Event.CollapsedStateChanged, this._detailsSectionCollapsedStateChanged, this);
+ else
+ this._objectTree.expand();
+ }
+
+ // Public
+
+ get objectTree() { return this._objectTree; }
+
+ // Private
+
+ _detailsSectionCollapsedStateChanged(event)
+ {
+ console.assert(!event.target.collapsed);
+
+ this._objectTree.expand();
+
+ event.target.removeEventListener(WebInspector.DetailsSection.Event.CollapsedStateChanged, this._detailsSectionCollapsedStateChanged, this);
+ }
+};
</ins></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScopeChainDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js (204512 => 204513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2016-08-16 17:14:42 UTC (rev 204512)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScopeChainDetailsSidebarPanel.js 2016-08-16 17:26:16 UTC (rev 204513)
</span><span class="lines">@@ -224,6 +224,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> let detailsSectionIdentifier = scope.type + "-" + sectionCountByType.get(scope.type);
</span><ins>+ let detailsSection = new WebInspector.DetailsSection(detailsSectionIdentifier, title, null, null, collapsedByDefault);
</ins><span class="cx">
</span><span class="cx"> // FIXME: This just puts two ObjectTreeViews next to each other, but that means
</span><span class="cx"> // that properties are not nicely sorted between the two separate lists.
</span><span class="lines">@@ -244,12 +245,9 @@
</span><span class="cx"> treeOutline.addEventListener(WebInspector.TreeOutline.Event.ElementAdded, this._treeElementAdded.bind(this, detailsSectionIdentifier), this);
</span><span class="cx"> treeOutline.addEventListener(WebInspector.TreeOutline.Event.ElementDisclosureDidChanged, this._treeElementDisclosureDidChange.bind(this, detailsSectionIdentifier), this);
</span><span class="cx">
</span><del>- // FIXME: <https://webkit.org/b/140567> Web Inspector: Do not request Scope Chain lists if section is collapsed (mainly Global Variables)
- // This autoexpands the ObjectTreeView and fetches all properties. Should wait to see if we are collapsed or not.
- rows.push(new WebInspector.DetailsSectionPropertiesRow(objectTree));
</del><ins>+ rows.push(new WebInspector.ObjectPropertiesDetailSectionRow(objectTree, detailsSection));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- let detailsSection = new WebInspector.DetailsSection(detailsSectionIdentifier, title, null, null, collapsedByDefault);
</del><span class="cx"> detailsSection.groups[0].rows = rows;
</span><span class="cx"> detailsSections.push(detailsSection);
</span><span class="cx"> }
</span><span class="lines">@@ -295,7 +293,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return Promise.all(promises).then(function() {
</span><del>- return Promise.resolve(new WebInspector.DetailsSectionPropertiesRow(objectTree));
</del><ins>+ return Promise.resolve(new WebInspector.ObjectPropertiesDetailSectionRow(objectTree));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>