<!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>[194574] 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/194574">194574</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-04 22:35:41 -0800 (Mon, 04 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: Timelines view doesn't remember how I like to sort things
https://bugs.webkit.org/show_bug.cgi?id=152626

Patch by Devin Rousso &lt;dcrousso+webkit@gmail.com&gt; on 2016-01-04
Reviewed by Joseph Pecoraro.

Currently, all instances of DataGrid have their sort column reset with each
open/close of Web Inspector. This doesn't really make sense seeing as we save
the user's settings in many other cases, so the sort method (which column)
should be saved between inspector sessions.

* UserInterface/Views/ApplicationCacheFrameContentView.js:
(WebInspector.ApplicationCacheFrameContentView.prototype._createDataGrid):
* UserInterface/Views/CookieStorageContentView.js:
(WebInspector.CookieStorageContentView.prototype._rebuildTable):
* UserInterface/Views/DOMStorageContentView.js:
(WebInspector.DOMStorageContentView):
* UserInterface/Views/DataGrid.js:
(WebInspector.DataGrid):
(WebInspector.DataGrid.prototype.set sortColumnIdentifier):
Moved the logic for classLists and events to _updateSortedColumn.

(WebInspector.DataGrid.prototype.set sortColumnIdentifierSetting):
Instead of just setting the original sort method when instantiating the DataGrid,
a WebInspector.Setting object is now able to be passed in via this setter
to give the DataGrid access to the stored sort method value.

(WebInspector.DataGrid.prototype._updateSortedColumn):
Updates the classLists and fires events. If a sort column setting object
exists, update its value.

* UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
(WebInspector.LayerTreeDetailsSidebarPanel.prototype._buildDataGridSection):
* UserInterface/Views/LayoutTimelineView.js:
(WebInspector.LayoutTimelineView):
* UserInterface/Views/NetworkGridContentView.js:
(WebInspector.NetworkGridContentView):
* UserInterface/Views/NetworkTimelineView.js:
(WebInspector.NetworkTimelineView):
* UserInterface/Views/RenderingFrameTimelineView.js:
(WebInspector.RenderingFrameTimelineView):
* UserInterface/Views/ScriptTimelineView.js:
(WebInspector.ScriptTimelineView):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs">trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewjs">trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/ChangeLog        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -1,5 +1,50 @@
</span><span class="cx"> 2016-01-04  Devin Rousso  &lt;dcrousso+webkit@gmail.com&gt;
</span><span class="cx"> 
</span><ins>+        Web Inspector: Timelines view doesn't remember how I like to sort things
+        https://bugs.webkit.org/show_bug.cgi?id=152626
+
+        Reviewed by Joseph Pecoraro.
+
+        Currently, all instances of DataGrid have their sort column reset with each
+        open/close of Web Inspector. This doesn't really make sense seeing as we save
+        the user's settings in many other cases, so the sort method (which column)
+        should be saved between inspector sessions.
+
+        * UserInterface/Views/ApplicationCacheFrameContentView.js:
+        (WebInspector.ApplicationCacheFrameContentView.prototype._createDataGrid):
+        * UserInterface/Views/CookieStorageContentView.js:
+        (WebInspector.CookieStorageContentView.prototype._rebuildTable):
+        * UserInterface/Views/DOMStorageContentView.js:
+        (WebInspector.DOMStorageContentView):
+        * UserInterface/Views/DataGrid.js:
+        (WebInspector.DataGrid):
+        (WebInspector.DataGrid.prototype.set sortColumnIdentifier):
+        Moved the logic for classLists and events to _updateSortedColumn.
+
+        (WebInspector.DataGrid.prototype.set sortColumnIdentifierSetting):
+        Instead of just setting the original sort method when instantiating the DataGrid,
+        a WebInspector.Setting object is now able to be passed in via this setter
+        to give the DataGrid access to the stored sort method value.
+
+        (WebInspector.DataGrid.prototype._updateSortedColumn):
+        Updates the classLists and fires events. If a sort column setting object
+        exists, update its value.
+
+        * UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
+        (WebInspector.LayerTreeDetailsSidebarPanel.prototype._buildDataGridSection):
+        * UserInterface/Views/LayoutTimelineView.js:
+        (WebInspector.LayoutTimelineView):
+        * UserInterface/Views/NetworkGridContentView.js:
+        (WebInspector.NetworkGridContentView):
+        * UserInterface/Views/NetworkTimelineView.js:
+        (WebInspector.NetworkTimelineView):
+        * UserInterface/Views/RenderingFrameTimelineView.js:
+        (WebInspector.RenderingFrameTimelineView):
+        * UserInterface/Views/ScriptTimelineView.js:
+        (WebInspector.ScriptTimelineView):
+
+2016-01-04  Devin Rousso  &lt;dcrousso+webkit@gmail.com&gt;
+
</ins><span class="cx">         Web Inspector: Add debounce to URL inputs in the Visual sidebar
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=152655
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsApplicationCacheFrameContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ApplicationCacheFrameContentView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx">         this._dataGrid = new WebInspector.DataGrid(columns);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</span><span class="cx"> 
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;url&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;application-cache-frame-content-view-sort&quot;, &quot;url&quot;);
</ins><span class="cx">         this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx"> 
</span><span class="cx">         this.addSubview(this._dataGrid);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsCookieStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/CookieStorageContentView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">             this._dataGrid.appendChild(node);
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;name&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;cookie-storage-content-view-sort&quot;, &quot;name&quot;);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     _filterCookies(cookies)
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDOMStorageContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DOMStorageContentView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> 
</span><span class="cx">         this._dataGrid = new WebInspector.DataGrid(columns, this._editingCallback.bind(this), this._deleteCallback.bind(this));
</span><span class="cx">         this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;key&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;dom-storage-content-view-sort&quot;, &quot;key&quot;);
</ins><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</span><span class="cx"> 
</span><span class="cx">         this.addSubview(this._dataGrid);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsDataGridjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/DataGrid.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">         this.orderedColumns = [];
</span><span class="cx"> 
</span><span class="cx">         this._sortColumnIdentifier = null;
</span><ins>+        this._sortColumnIdentifierSetting = null;
</ins><span class="cx">         this._sortOrder = WebInspector.DataGrid.SortOrder.Indeterminate;
</span><span class="cx"> 
</span><span class="cx">         this.children = [];
</span><span class="lines">@@ -208,17 +209,33 @@
</span><span class="cx">         if (this._sortColumnIdentifier === columnIdentifier)
</span><span class="cx">             return;
</span><span class="cx"> 
</span><del>-        var oldSortColumnIdentifier = this._sortColumnIdentifier;
</del><ins>+        let oldSortColumnIdentifier = this._sortColumnIdentifier;
</ins><span class="cx">         this._sortColumnIdentifier = columnIdentifier;
</span><ins>+        this._updateSortedColumn(oldSortColumnIdentifier);
+    }
</ins><span class="cx"> 
</span><ins>+    set sortColumnIdentifierSetting(setting)
+    {
+        console.assert(setting instanceof WebInspector.Setting);
+
+        this._sortColumnIdentifierSetting = setting;
+        if (this._sortColumnIdentifierSetting.value)
+            this.sortColumnIdentifier = this._sortColumnIdentifierSetting.value;
+    }
+
+    _updateSortedColumn(oldSortColumnIdentifier)
+    {
+        if (this._sortColumnIdentifierSetting)
+            this._sortColumnIdentifierSetting.value = this._sortColumnIdentifier;
+
</ins><span class="cx">         if (oldSortColumnIdentifier) {
</span><del>-            var oldSortHeaderCellElement = this._headerTableCellElements.get(oldSortColumnIdentifier);
</del><ins>+            let oldSortHeaderCellElement = this._headerTableCellElements.get(oldSortColumnIdentifier);
</ins><span class="cx">             oldSortHeaderCellElement.classList.remove(WebInspector.DataGrid.SortColumnAscendingStyleClassName);
</span><span class="cx">             oldSortHeaderCellElement.classList.remove(WebInspector.DataGrid.SortColumnDescendingStyleClassName);
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         if (this._sortColumnIdentifier) {
</span><del>-            var newSortHeaderCellElement = this._headerTableCellElements.get(this._sortColumnIdentifier);
</del><ins>+            let newSortHeaderCellElement = this._headerTableCellElements.get(this._sortColumnIdentifier);
</ins><span class="cx">             newSortHeaderCellElement.classList.toggle(WebInspector.DataGrid.SortColumnAscendingStyleClassName, this._sortOrder === WebInspector.DataGrid.SortOrder.Ascending);
</span><span class="cx">             newSortHeaderCellElement.classList.toggle(WebInspector.DataGrid.SortColumnDescendingStyleClassName, this._sortOrder === WebInspector.DataGrid.SortOrder.Descending);
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SortChanged, this._sortDataGrid, this);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._selectedDataGridNodeChanged, this);
</span><span class="cx"> 
</span><del>-        this.sortColumnIdentifier = &quot;memory&quot;;
</del><ins>+        this.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;layer-tree-details-sidebar-panel-sort&quot;, &quot;memory&quot;);
</ins><span class="cx">         this.sortOrder = WebInspector.DataGrid.SortOrder.Descending;
</span><span class="cx"> 
</span><span class="cx">         var element = this._dataGrid.element;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsLayoutTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><span class="cx"> 
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;startTime&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;layout-timeline-view-sort&quot;, &quot;startTime&quot;);
</ins><span class="cx">         this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx"> 
</span><span class="cx">         this._hoveredTreeElement = null;
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> 
</span><span class="cx">         this._dataGrid = new WebInspector.TimelineDataGrid(this._contentTreeOutline, columns);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;requestSent&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;network-grid-content-view-sort&quot;, &quot;requestSent&quot;);
</ins><span class="cx">         this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx"> 
</span><span class="cx">         this.element.classList.add(&quot;network-grid&quot;);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">         this._dataGrid = new WebInspector.TimelineDataGrid(this.navigationSidebarTreeOutline, columns);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;requestSent&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;network-timeline-view-sort&quot;, &quot;requestSent&quot;);
</ins><span class="cx">         this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx"> 
</span><span class="cx">         this.element.classList.add(&quot;network&quot;);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsRenderingFrameTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/RenderingFrameTimelineView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> 
</span><span class="cx">         this._dataGrid = new WebInspector.TimelineDataGrid(this.navigationSidebarTreeOutline, columns, this);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;startTime&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;rendering-frame-timeline-view-sort&quot;, &quot;startTime&quot;);
</ins><span class="cx">         this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx"> 
</span><span class="cx">         this.element.classList.add(&quot;rendering-frame&quot;);
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsScriptTimelineViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js (194573 => 194574)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js        2016-01-05 06:32:28 UTC (rev 194573)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ScriptTimelineView.js        2016-01-05 06:35:41 UTC (rev 194574)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">         this._dataGrid = new WebInspector.ScriptTimelineDataGrid(this.navigationSidebarTreeOutline, columns, this);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.TimelineDataGrid.Event.FiltersDidChange, this._dataGridFiltersDidChange, this);
</span><span class="cx">         this._dataGrid.addEventListener(WebInspector.DataGrid.Event.SelectedNodeChanged, this._dataGridNodeSelected, this);
</span><del>-        this._dataGrid.sortColumnIdentifier = &quot;startTime&quot;;
</del><ins>+        this._dataGrid.sortColumnIdentifierSetting = new WebInspector.Setting(&quot;script-timeline-view-sort&quot;, &quot;startTime&quot;);
</ins><span class="cx">         this._dataGrid.sortOrder = WebInspector.DataGrid.SortOrder.Ascending;
</span><span class="cx"> 
</span><span class="cx">         this.element.classList.add(&quot;script&quot;);
</span></span></pre>
</div>
</div>

</body>
</html>