2011-05-26 Vsevolod Vlasov <vsevik@chromium.org>

        Reviewed by Yury Semikhatsky.

        Web Inspector: In network panel, show transfer size in a first line of resource row.
        https://bugs.webkit.org/show_bug.cgi?id=61354

        * English.lproj/localizedStrings.js:
        * inspector/front-end/NetworkPanel.js:
        (WebInspector.NetworkPanel.prototype._createTable):
        (WebInspector.NetworkDataGridNode.prototype._refreshSizeCell):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87388 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index cb6c050..fc1e286 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-26  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: In network panel, show transfer size in a first line of resource row.
+        https://bugs.webkit.org/show_bug.cgi?id=61354
+
+        * English.lproj/localizedStrings.js:
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkPanel.prototype._createTable):
+        (WebInspector.NetworkDataGridNode.prototype._refreshSizeCell):
+
 2011-05-25  Simon Fraser  <simon.fraser@apple.com>
 
         Reviewed by Dan Bernstein.

diff --git a/Source/WebCore/English.lproj/localizedStrings.js b/Source/WebCore/English.lproj/localizedStrings.js
index 8decf45..ecf73b7 100644 (file)
Binary files a/Source/WebCore/English.lproj/localizedStrings.js and b/Source/WebCore/English.lproj/localizedStrings.js differ

diff --git a/Source/WebCore/inspector/front-end/NetworkPanel.js b/Source/WebCore/inspector/front-end/NetworkPanel.js
index 58c5b1b..38f3211 100644 (file)
--- a/Source/WebCore/inspector/front-end/NetworkPanel.js
+++ b/Source/WebCore/inspector/front-end/NetworkPanel.js
@@ -175,7 +175,7 @@ WebInspector.NetworkPanel.prototype = {
         columns.type.sortable = true;
         columns.type.width = "6%";
 
-        columns.size.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Size"), WebInspector.UIString("Transfer"));
+        columns.size.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Size"), WebInspector.UIString("Content"));
         columns.size.sortable = true;
         columns.size.width = "6%";
         columns.size.aligned = "right";
@@ -1600,16 +1600,16 @@ WebInspector.NetworkDataGridNode.prototype = {
 
     _refreshSizeCell: function()
     {
-        var resourceSize = typeof this._resource.resourceSize === "number" ? Number.bytesToString(this._resource.resourceSize) : "?";
-        var transferSize = typeof this._resource.transferSize === "number" ? Number.bytesToString(this._resource.transferSize) : "?";
-        var fromCache = this._resource.cached;
-        this._sizeCell.setTextAndTitle(!fromCache ? resourceSize : WebInspector.UIString("(from cache)"));
-        if (fromCache)
+        if (this._resource.cached) {
+            this._sizeCell.setTextAndTitle(WebInspector.UIString("(from cache)"));
             this._sizeCell.addStyleClass("network-dim-cell");
-        else
+        } else {
+            var resourceSize = typeof this._resource.resourceSize === "number" ? Number.bytesToString(this._resource.resourceSize) : "?";
+            var transferSize = typeof this._resource.transferSize === "number" ? Number.bytesToString(this._resource.transferSize) : "?";
+            this._sizeCell.setTextAndTitle(transferSize);
             this._sizeCell.removeStyleClass("network-dim-cell");
-        if (!fromCache)
-            this._appendSubtitle(this._sizeCell, transferSize);
+            this._appendSubtitle(this._sizeCell, resourceSize);
+        }
     },
 
     _refreshTimeCell: function()