[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

pfeldman at chromium.org pfeldman at chromium.org
Wed Dec 22 15:44:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 7b9952c3f2c0558ff81e5245e285ff6324a5117b
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 14:06:50 2010 +0000

    2010-11-11  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: size of resources in summary is 0
            when there are redirects.
            https://bugs.webkit.org/show_bug.cgi?id=49242
    
            * inspector/front-end/NetworkPanel.js:
            (WebInspector.NetworkPanel.prototype._updateSummaryBar):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71814 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 60a57cf..8895ad1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-11  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: size of resources in summary is 0
+        when there are redirects.
+        https://bugs.webkit.org/show_bug.cgi?id=49242
+
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkPanel.prototype._updateSummaryBar):
+
 2010-11-11  Ben Murdoch  <benm at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/inspector/front-end/NetworkPanel.js b/WebCore/inspector/front-end/NetworkPanel.js
index 71433af..4e0a64a 100644
--- a/WebCore/inspector/front-end/NetworkPanel.js
+++ b/WebCore/inspector/front-end/NetworkPanel.js
@@ -392,7 +392,7 @@ WebInspector.NetworkPanel.prototype = {
         var maxTime = -1;
         for (var i = 0; i < this._resources.length; ++i) {
             var resource = this._resources[i];
-            transferSize += resource.cached ? 0 : resource.transferSize;
+            transferSize += (resource.cached || !resource.transferSize) ? 0 : resource.transferSize;
             if (resource.isMainResource)
                 baseTime = resource.startTime;
             if (resource.endTime > maxTime) 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list