<!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>[203243] 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/203243">203243</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-14 14:42:42 -0700 (Thu, 14 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Maintain selected function when switching between different profile representations
https://bugs.webkit.org/show_bug.cgi?id=159778
<rdar://problem/27355913>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-07-14
Reviewed by Timothy Hatcher.
* UserInterface/Models/CallingContextTree.js:
(WebInspector.CCTNode):
(WebInspector.CCTNode.prototype.get hash):
(WebInspector.CCTNode.prototype.findOrMakeChild):
(WebInspector.CCTNode.prototype.equals):
Expose the hash so two nodes can be compared cheaply.
* UserInterface/Views/ProfileView.js:
(WebInspector.ProfileView.prototype._repopulateDataGridFromTree):
(WebInspector.ProfileView.prototype._restoreSharedState):
(WebInspector.ProfileView.prototype._dataGridNodeSelected):
Share data between multiple ProfileViews. Currently just remembering
and restoring the selected function.
* UserInterface/Views/ScriptProfileTimelineView.js:
(WebInspector.ScriptProfileTimelineView):
(WebInspector.ScriptProfileTimelineView.prototype._showProfileViewForOrientation):
Include the shared data when constructing new ProfileViews.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsCallingContextTreejs">trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsProfileViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptProfileTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (203242 => 203243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-07-14 21:39:15 UTC (rev 203242)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-07-14 21:42:42 UTC (rev 203243)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-07-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Maintain selected function when switching between different profile representations
+ https://bugs.webkit.org/show_bug.cgi?id=159778
+ <rdar://problem/27355913>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Models/CallingContextTree.js:
+ (WebInspector.CCTNode):
+ (WebInspector.CCTNode.prototype.get hash):
+ (WebInspector.CCTNode.prototype.findOrMakeChild):
+ (WebInspector.CCTNode.prototype.equals):
+ Expose the hash so two nodes can be compared cheaply.
+
+ * UserInterface/Views/ProfileView.js:
+ (WebInspector.ProfileView.prototype._repopulateDataGridFromTree):
+ (WebInspector.ProfileView.prototype._restoreSharedState):
+ (WebInspector.ProfileView.prototype._dataGridNodeSelected):
+ Share data between multiple ProfileViews. Currently just remembering
+ and restoring the selected function.
+
+ * UserInterface/Views/ScriptProfileTimelineView.js:
+ (WebInspector.ScriptProfileTimelineView):
+ (WebInspector.ScriptProfileTimelineView.prototype._showProfileViewForOrientation):
+ Include the shared data when constructing new ProfileViews.
+
</ins><span class="cx"> 2016-07-13 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Uncaught Exception: TypeError: null is not an object (evaluating 'this._contentViewContainer.currentContentView.showsFilterBar')
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsCallingContextTreejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js (203242 => 203243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js 2016-07-14 21:39:15 UTC (rev 203242)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CallingContextTree.js 2016-07-14 21:42:42 UTC (rev 203243)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.CCTNode = class CCTNode extends WebInspector.Object
</span><span class="cx"> {
</span><del>- constructor(sourceID, line, column, name, url)
</del><ins>+ constructor(sourceID, line, column, name, url, hash)
</ins><span class="cx"> {
</span><span class="cx"> super();
</span><span class="cx">
</span><span class="lines">@@ -187,6 +187,8 @@
</span><span class="cx"> this._leafTimestamps = [];
</span><span class="cx"> this._leafDurations = [];
</span><span class="cx"> this._expressionLocations = {}; // Keys are "line:column" strings. Values are arrays of timestamps in sorted order.
</span><ins>+
+ this._hash = hash || WebInspector.CCTNode._hash(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Static and Private
</span><span class="lines">@@ -204,6 +206,7 @@
</span><span class="cx"> get name() { return this._name; }
</span><span class="cx"> get uid() { return this._uid; }
</span><span class="cx"> get url() { return this._url; }
</span><ins>+ get hash() { return this._hash; }
</ins><span class="cx">
</span><span class="cx"> hasChildrenInTimeRange(startTime, endTime)
</span><span class="cx"> {
</span><span class="lines">@@ -276,7 +279,7 @@
</span><span class="cx"> let node = this._children[hash];
</span><span class="cx"> if (node)
</span><span class="cx"> return node;
</span><del>- node = new WebInspector.CCTNode(stackFrame.sourceID, stackFrame.line, stackFrame.column, stackFrame.name, stackFrame.url);
</del><ins>+ node = new WebInspector.CCTNode(stackFrame.sourceID, stackFrame.line, stackFrame.column, stackFrame.name, stackFrame.url, hash);
</ins><span class="cx"> this._children[hash] = node;
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="lines">@@ -322,7 +325,7 @@
</span><span class="cx">
</span><span class="cx"> equals(other)
</span><span class="cx"> {
</span><del>- return WebInspector.CCTNode._hash(this) === WebInspector.CCTNode._hash(other);
</del><ins>+ return this._hash === other.hash;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> toCPUProfileNode(numSamples, startTime, endTime)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsProfileViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.js (203242 => 203243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.js 2016-07-14 21:39:15 UTC (rev 203242)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ProfileView.js 2016-07-14 21:42:42 UTC (rev 203243)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> WebInspector.ProfileView = class ProfileView extends WebInspector.ContentView
</span><span class="cx"> {
</span><del>- constructor(callingContextTree)
</del><ins>+ constructor(callingContextTree, extraArguments)
</ins><span class="cx"> {
</span><span class="cx"> super(callingContextTree);
</span><span class="cx">
</span><span class="lines">@@ -69,6 +69,10 @@
</span><span class="cx"> this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Descending;
</span><span class="cx"> this._dataGrid.createSettings("profile-view");
</span><span class="cx">
</span><ins>+ // Currently we create a new ProfileView for each CallingContextTree, so
+ // to share state between them, use a common shared data object.
+ this._sharedData = extraArguments;
+
</ins><span class="cx"> this.addSubview(this._dataGrid);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,10 +155,26 @@
</span><span class="cx"> _repopulateDataGridFromTree()
</span><span class="cx"> {
</span><span class="cx"> this._dataGrid.removeChildren();
</span><ins>+
</ins><span class="cx"> for (let child of this._profileDataGridTree.children)
</span><span class="cx"> this._dataGrid.appendChild(child);
</span><ins>+
+ this._restoreSharedState();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ _restoreSharedState()
+ {
+ const skipHidden = false;
+ const stayWithin = this._dataGrid;
+ const dontPopulate = true;
+
+ if (this._sharedData.selectedNodeHash) {
+ let nodeToSelect = this._dataGrid.findNode((node) => node.callingContextTreeNode.hash === this._sharedData.selectedNodeHash, skipHidden, stayWithin, dontPopulate);
+ if (nodeToSelect)
+ nodeToSelect.revealAndSelect();
+ }
+ }
+
</ins><span class="cx"> _pathComponentClicked(event)
</span><span class="cx"> {
</span><span class="cx"> if (!event.data.pathComponent)
</span><span class="lines">@@ -201,6 +221,8 @@
</span><span class="cx"> if (newSelectedNode) {
</span><span class="cx"> this._removeGuidanceElement(WebInspector.ProfileView.GuidanceType.Selected, newSelectedNode);
</span><span class="cx"> newSelectedNode.forEachChildInSubtree((node) => this._appendGuidanceElement(WebInspector.ProfileView.GuidanceType.Selected, node, newSelectedNode));
</span><ins>+
+ this._sharedData.selectedNodeHash = newSelectedNode.callingContextTreeNode.hash;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptProfileTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js (203242 => 203243)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js 2016-07-14 21:39:15 UTC (rev 203242)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptProfileTimelineView.js 2016-07-14 21:42:42 UTC (rev 203243)
</span><span class="lines">@@ -39,6 +39,10 @@
</span><span class="cx"> this._lastLayoutStartTime = undefined;
</span><span class="cx"> this._lastLayoutEndTime = undefined;
</span><span class="cx">
</span><ins>+ this._sharedProfileViewData = {
+ selectedNodeHash: null,
+ };
+
</ins><span class="cx"> if (!WebInspector.ScriptProfileTimelineView.profileOrientationSetting)
</span><span class="cx"> WebInspector.ScriptProfileTimelineView.profileOrientationSetting = new WebInspector.Setting("script-profile-timeline-view-profile-orientation-setting", WebInspector.ScriptProfileTimelineView.ProfileOrientation.TopDown);
</span><span class="cx"> if (!WebInspector.ScriptProfileTimelineView.profileTypeSetting)
</span><span class="lines">@@ -179,7 +183,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> let callingContextTree = this._callingContextTreeForOrientation(profileOrientation, profileViewType);
</span><del>- this._profileView = new WebInspector.ProfileView(callingContextTree);
</del><ins>+ this._profileView = new WebInspector.ProfileView(callingContextTree, this._sharedProfileViewData);
</ins><span class="cx"> this._profileView.addEventListener(WebInspector.ContentView.Event.SelectionPathComponentsDidChange, this._profileViewSelectionPathComponentsDidChange, this);
</span><span class="cx">
</span><span class="cx"> this.addSubview(this._profileView);
</span></span></pre>
</div>
</div>
</body>
</html>