Changeset 64037 in webkit

Timestamp:

Jul 26, 2010 2:37:38 AM (14 years ago)

Author:

apavlov@chromium.org

Message:

2010-07-26 Alexander Pavlov <​apavlov@chromium.org>

Reviewed by Joseph Pecoraro.

Inspector should remember resources sorting set by the user
​https://bugs.webkit.org/show_bug.cgi?id=19208

Sorting options both for time and size graphs are memorized in a single property,
which makes them possible to retrieve in a single message (e.g. useful for remote debugging).

• inspector/front-end/ResourcesPanel.js: (WebInspector.ResourcesPanel.prototype.populateSidebar): (WebInspector.ResourcesPanel.prototype._settingsLoaded): (WebInspector.ResourcesPanel.prototype._loadSortOptions): (WebInspector.ResourcesPanel.prototype._loadSortOptionForGraph): (WebInspector.ResourcesPanel.prototype._graphSelected): (WebInspector.ResourcesPanel.prototype._changeSortingFunction): (WebInspector.ResourcesPanel.prototype._selectedOptionNameForGraph): (WebInspector.ResourcesPanel.prototype._doChangeSortingFunction):
• inspector/front-end/Settings.js: (WebInspector.populateApplicationSettings):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/ResourcesPanel.js (modified) (6 diffs)
• inspector/front-end/Settings.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-26  Alexander Pavlov  <apavlov@chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Inspector should remember resources sorting set by the user
+        https://bugs.webkit.org/show_bug.cgi?id=19208
+
+        Sorting options both for time and size graphs are memorized in a single property,
+        which makes them possible to retrieve in a single message (e.g. useful for remote debugging).
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype.populateSidebar):
+        (WebInspector.ResourcesPanel.prototype._settingsLoaded):
+        (WebInspector.ResourcesPanel.prototype._loadSortOptions):
+        (WebInspector.ResourcesPanel.prototype._loadSortOptionForGraph):
+        (WebInspector.ResourcesPanel.prototype._graphSelected):
+        (WebInspector.ResourcesPanel.prototype._changeSortingFunction):
+        (WebInspector.ResourcesPanel.prototype._selectedOptionNameForGraph):
+        (WebInspector.ResourcesPanel.prototype._doChangeSortingFunction):
+        * inspector/front-end/Settings.js:
+        (WebInspector.populateApplicationSettings):
+
 2010-07-25  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/inspector/front-end/ResourcesPanel.js

@@ -83 +83 @@
     populateSidebar: function()
     {
-        var timeGraphItem = new WebInspector.SidebarTreeElement("resources-time-graph-sidebar-item", WebInspector.UIString("Time"));
-        timeGraphItem.onselect = this._graphSelected.bind(this);
+        this.timeGraphItem = new WebInspector.SidebarTreeElement("resources-time-graph-sidebar-item", WebInspector.UIString("Time"));
+        this.timeGraphItem.onselect = this._graphSelected.bind(this);
 
         var transferTimeCalculator = new WebInspector.ResourceTransferTimeCalculator();
         var transferDurationCalculator = new WebInspector.ResourceTransferDurationCalculator();
 
-        timeGraphItem.sortingOptions = [
-            { name: WebInspector.UIString("Sort by Start Time"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByAscendingStartTime, calculator: transferTimeCalculator },
-            { name: WebInspector.UIString("Sort by Response Time"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByAscendingResponseReceivedTime, calculator: transferTimeCalculator },
-            { name: WebInspector.UIString("Sort by End Time"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByAscendingEndTime, calculator: transferTimeCalculator },
-            { name: WebInspector.UIString("Sort by Duration"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingDuration, calculator: transferDurationCalculator },
-            { name: WebInspector.UIString("Sort by Latency"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingLatency, calculator: transferDurationCalculator },
+        this.timeGraphItem.sortingOptions = [
+            { name: WebInspector.UIString("Sort by Start Time"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByAscendingStartTime, calculator: transferTimeCalculator, optionName: "startTime" },
+            { name: WebInspector.UIString("Sort by Response Time"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByAscendingResponseReceivedTime, calculator: transferTimeCalculator, optionName: "responseTime" },
+            { name: WebInspector.UIString("Sort by End Time"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByAscendingEndTime, calculator: transferTimeCalculator, optionName: "endTime" },
+            { name: WebInspector.UIString("Sort by Duration"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingDuration, calculator: transferDurationCalculator, optionName: "duration" },
+            { name: WebInspector.UIString("Sort by Latency"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingLatency, calculator: transferDurationCalculator, optionName: "latency" },
         ];
 
-        timeGraphItem.isBarOpaqueAtLeft = false;
-        timeGraphItem.selectedSortingOptionIndex = 1;
+        this.timeGraphItem.isBarOpaqueAtLeft = false;
+        this.timeGraphItem.selectedSortingOptionIndex = 1;
 
         this.sizeGraphItem = new WebInspector.SidebarTreeElement("resources-size-graph-sidebar-item", WebInspector.UIString("Size"));
@@ -105 +105 @@
         var transferSizeCalculator = new WebInspector.ResourceTransferSizeCalculator();
         this.sizeGraphItem.sortingOptions = [
-            { name: WebInspector.UIString("Sort by Transfer Size"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingTransferSize, calculator: transferSizeCalculator },
-            { name: WebInspector.UIString("Sort by Size"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingSize, calculator: transferSizeCalculator },
+            { name: WebInspector.UIString("Sort by Transfer Size"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingTransferSize, calculator: transferSizeCalculator, optionName: "transferSize" },
+            { name: WebInspector.UIString("Sort by Size"), sortingFunction: WebInspector.ResourceSidebarTreeElement.CompareByDescendingSize, calculator: transferSizeCalculator, optionName: "size" },
         ];
 
@@ -115 +115 @@
         this.sidebarTree.appendChild(this.graphsTreeElement);
 
-        this.graphsTreeElement.appendChild(timeGraphItem);
+        this.graphsTreeElement.appendChild(this.timeGraphItem);
         this.graphsTreeElement.appendChild(this.sizeGraphItem);
         this.graphsTreeElement.expand();
@@ -161 +161 @@
         if (!WebInspector.applicationSettings.resourcesLargeRows)
             this._setLargerResources(WebInspector.applicationSettings.resourcesLargeRows);
+        this._loadSortOptions();
+    },
+
+    _loadSortOptions: function()
+    {
+        var newOptions = WebInspector.applicationSettings.resourcesSortOptions;
+        if (!newOptions)
+            return;
+
+        this._loadSortOptionForGraph(this.timeGraphItem, newOptions.timeOption || "responseTime");
+        this._loadSortOptionForGraph(this.sizeGraphItem, newOptions.sizeOption || "transferSize");
+    },
+
+    _loadSortOptionForGraph: function(graphItem, newOptionName)
+    {
+        var sortingOptions = graphItem.sortingOptions;
+        for (var i = 0; i < sortingOptions.length; ++i) {
+            if (sortingOptions[i].optionName === newOptionName) {
+                graphItem.selectedSortingOptionIndex = i;
+                // Propagate the option change down to the currently selected option.
+                if (this._lastSelectedGraphTreeElement === graphItem) {
+                    this._lastSelectedGraphTreeElement = null;
+                    this._graphSelected(graphItem);
+                }
+            }
+        }
     },
 
@@ -619 +645 @@
             option.sortingFunction = sortingOption.sortingFunction;
             option.calculator = sortingOption.calculator;
+            option.optionName = sortingOption.optionName;
             this.sortingSelectElement.appendChild(option);
         }
 
         this.sortingSelectElement.selectedIndex = treeElement.selectedSortingOptionIndex;
-        this._changeSortingFunction();
+        this._doChangeSortingFunction();
 
         this.closeVisibleResource();
@@ -659 +686 @@
     _changeSortingFunction: function()
     {
-        var selectedOption = this.sortingSelectElement[this.sortingSelectElement.selectedIndex];
+        this._doChangeSortingFunction();
+        WebInspector.applicationSettings.resourcesSortOptions = {timeOption: this._selectedOptionNameForGraph(this.timeGraphItem), sizeOption: this._selectedOptionNameForGraph(this.sizeGraphItem)};
+    },
+
+    _selectedOptionNameForGraph: function(graphItem)
+    {
+        return graphItem.sortingOptions[graphItem.selectedSortingOptionIndex].optionName;
+    },
+
+    _doChangeSortingFunction: function()
+    {
+        var selectedIndex = this.sortingSelectElement.selectedIndex;
+        if (this._lastSelectedGraphTreeElement)
+            this._lastSelectedGraphTreeElement.selectedSortingOptionIndex = selectedIndex;
+        var selectedOption = this.sortingSelectElement[selectedIndex];
         this.sortingFunction = selectedOption.sortingFunction;
         this.calculator = this.summaryBar.calculator = selectedOption.calculator;

trunk/WebCore/inspector/front-end/Settings.js

@@ -59 +59 @@
     WebInspector.applicationSettings.installSetting("resourceViewTab", "resource-view-tab", "content");
     WebInspector.applicationSettings.installSetting("consoleHistory", "console-history", []);
+    WebInspector.applicationSettings.installSetting("resourcesSortOptions", "resources-sort-options", {timeOption: "responseTime", sizeOption: "transferSize"});
 
     WebInspector.applicationSettings.dispatchEventToListeners("loaded");