Changeset 92213 in webkit

Timestamp:

Aug 2, 2011 11:41:36 AM (13 years ago)

Author:

vsevik@chromium.org

Message:

Web Inspector: Remove initator column for JSC, fix network resource initiator tests.
​https://bugs.webkit.org/show_bug.cgi?id=65534

Reviewed by Pavel Feldman.

Source/WebCore:

• inspector/front-end/NetworkPanel.js:

(WebInspector.NetworkLogView.prototype._createTable):
(WebInspector.NetworkLogView.prototype.switchToDetailedView):
(WebInspector.NetworkLogView.prototype.switchToBriefView):
(WebInspector.NetworkLogView.prototype._toggleGridMode):
(WebInspector.NetworkLogView.prototype._toggleViewingResourceMode):
(WebInspector.NetworkDataGridNode.prototype.createCells):
(WebInspector.NetworkDataGridNode.prototype.refreshResource):

• inspector/front-end/Settings.js:

Source/WebKit/chromium:

• src/js/DevTools.js:

():

LayoutTests:

• http/tests/inspector/network/network-initiator-expected.txt:
• http/tests/inspector/network/network-initiator.html:
• platform/chromium/http/tests/inspector/network/network-initiator-expected.txt: Copied from LayoutTests/http/tests/inspector/network/network-initiator-expected.txt.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/network/network-initiator-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/inspector/network/network-initiator.html (modified) (1 diff)
• LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt (copied) (copied from trunk/LayoutTests/http/tests/inspector/network/network-initiator-expected.txt)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/NetworkPanel.js (modified) (11 diffs)
• Source/WebCore/inspector/front-end/Settings.js (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/src/js/DevTools.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-02  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Remove initator column for JSC, fix network resource initiator tests.
+        https://bugs.webkit.org/show_bug.cgi?id=65534
+
+        Reviewed by Pavel Feldman.
+
+        * http/tests/inspector/network/network-initiator-expected.txt:
+        * http/tests/inspector/network/network-initiator.html:
+        * platform/chromium/http/tests/inspector/network/network-initiator-expected.txt: Copied from LayoutTests/http/tests/inspector/network/network-initiator-expected.txt.
+
 2011-08-02  Zhenyao Mo  <zmo@google.com>
 

trunk/LayoutTests/http/tests/inspector/network/network-initiator-expected.txt

@@ -12 +12 @@
 http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=200: parser
     http://127.0.0.1:8000/inspector/network/network-initiator.html 100
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=300: script
-    http://127.0.0.1:8000/inspector/network/network-initiator.html 17
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=400: script
-    http://127.0.0.1:8000/inspector/network/network-initiator.html 29
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=300: other
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=400: other
 

trunk/LayoutTests/http/tests/inspector/network/network-initiator.html

@@ -10 +10 @@
     // We need to setTimeout, to make sure that style recalculation scheduling
     // is really triggered by adding a class to the div.
-    window.setTimeout(addClassToDivStep2.bind(this), 0);
+    window.setTimeout(addClassToDivStep2, 0);
 }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-02  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Remove initator column for JSC, fix network resource initiator tests.
+        https://bugs.webkit.org/show_bug.cgi?id=65534
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkLogView.prototype._createTable):
+        (WebInspector.NetworkLogView.prototype.switchToDetailedView):
+        (WebInspector.NetworkLogView.prototype.switchToBriefView):
+        (WebInspector.NetworkLogView.prototype._toggleGridMode):
+        (WebInspector.NetworkLogView.prototype._toggleViewingResourceMode):
+        (WebInspector.NetworkDataGridNode.prototype.createCells):
+        (WebInspector.NetworkDataGridNode.prototype.refreshResource):
+        * inspector/front-end/Settings.js:
+
 2011-08-02  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/front-end/NetworkPanel.js

@@ -144 +144 @@
     _createTable: function()
     {
-        var columns = {name: {}, method: {}, status: {}, type: {}, initiator: {}, size: {}, time: {}, timeline: {}};
+        var columns;
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            columns = {name: {}, method: {}, status: {}, type: {}, initiator: {}, size: {}, time: {}, timeline: {}};
+        else
+            columns = {name: {}, method: {}, status: {}, type: {}, size: {}, time: {}, timeline: {}};
         columns.name.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Name"), WebInspector.UIString("Path"));
         columns.name.sortable = true;
@@ -162 +166 @@
         columns.type.width = "6%";
 
-        columns.initiator.title = WebInspector.UIString("Initiator");
-        columns.initiator.sortable = true;
-        columns.initiator.width = "10%";
+        if (Preferences.showNetworkPanelInitiatorColumn) {
+            columns.initiator.title = WebInspector.UIString("Initiator");
+            columns.initiator.sortable = true;
+            columns.initiator.width = "10%";
+        }
 
         columns.size.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Size"), WebInspector.UIString("Content"));
@@ -178 +184 @@
         columns.timeline.title = "";
         columns.timeline.sortable = false;
-        columns.timeline.width = "40%";
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            columns.timeline.width = "40%";
+        else
+            columns.timeline.width = "50%";
         columns.timeline.sort = "ascending";
 
@@ -806 +815 @@
         this._dataGrid.showColumn("status");
         this._dataGrid.showColumn("type");
-        this._dataGrid.showColumn("initiator");
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            this._dataGrid.showColumn("initiator");
         this._dataGrid.showColumn("size");
         this._dataGrid.showColumn("time");
@@ -816 +826 @@
         widths.status = 6;
         widths.type = 6;
-        widths.initiator = 10;
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            widths.initiator = 10;
         widths.size = 6;
         widths.time = 6;
-        widths.timeline = 40;
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            widths.timeline = 40;
+        else
+            widths.timeline = 50;
 
         this._dataGrid.applyColumnWidthsMap(widths);
@@ -831 +845 @@
         this._dataGrid.hideColumn("status");
         this._dataGrid.hideColumn("type");
-        this._dataGrid.hideColumn("initiator");
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            this._dataGrid.hideColumn("initiator");
         this._dataGrid.hideColumn("size");
         this._dataGrid.hideColumn("time");
@@ -900 +915 @@
         this._dataGrid.showColumn("status");
         this._dataGrid.showColumn("type");
-        this._dataGrid.showColumn("initiator");
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            this._dataGrid.showColumn("initiator");
         this._dataGrid.showColumn("size");
         this._dataGrid.showColumn("time");
@@ -909 +925 @@
         widths.status = 6;
         widths.type = 6;
-        widths.initiator = 10;
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            widths.initiator = 10;
         widths.size = 6;
         widths.time = 6;
-        widths.timeline = 40;
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            widths.timeline = 40;
+        else
+            widths.timeline = 50;
 
         this._dataGrid.showColumn("timeline");
@@ -929 +949 @@
         this._dataGrid.hideColumn("status");
         this._dataGrid.hideColumn("type");
-        this._dataGrid.hideColumn("initiator");
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            this._dataGrid.hideColumn("initiator");
         this._dataGrid.hideColumn("size");
         this._dataGrid.hideColumn("time");
@@ -1736 +1757 @@
         this._statusCell = this._createDivInTD("status");
         this._typeCell = this._createDivInTD("type");
-        this._initiatorCell = this._createDivInTD("initiator");
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            this._initiatorCell = this._createDivInTD("initiator");
         this._sizeCell = this._createDivInTD("size");
         this._timeCell = this._createDivInTD("time");
@@ -1829 +1851 @@
         this._refreshStatusCell();
         this._refreshTypeCell();
-        this._refreshInitiatorCell();
+        if (Preferences.showNetworkPanelInitiatorColumn)
+            this._refreshInitiatorCell();
         this._refreshSizeCell();
         this._refreshTimeCell();

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

@@ -55 +55 @@
     canInspectWorkers: false,
     canClearCacheAndCookies: false,
-    canDisableCache: false
+    canDisableCache: false,
+    showNetworkPanelInitiatorColumn: false
 }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-08-02  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Web Inspector: Remove initator column for JSC, fix network resource initiator tests.
+        https://bugs.webkit.org/show_bug.cgi?id=65534
+
+        Reviewed by Pavel Feldman.
+
+        * src/js/DevTools.js:
+        ():
+
 2011-08-02  Nat Duca  <nduca@chromium.org>
 

trunk/Source/WebKit/chromium/src/js/DevTools.js

@@ -56 +56 @@
     Preferences.canClearCacheAndCookies = true;
     Preferences.canDisableCache = true;
+    Preferences.showNetworkPanelInitiatorColumn = true;
 })();