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

[pfeldman at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 586279d6f0ebeddfec38fc62266792b7bf0f15d3
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 16:11:48 2010 +0000

    2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: do not include SSL time into Waiting time.
    
            https://bugs.webkit.org/show_bug.cgi?id=42458
    
            * inspector/front-end/ResourcesPanel.js:
            (WebInspector.ResourcesPanel.prototype._showPopover):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63557 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 986cedc..297b54f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: do not include SSL time into Waiting time.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42458
+
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype._showPopover):
+
 2010-07-16  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index f3dfdfe..547774d 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -786,7 +786,11 @@ WebInspector.ResourcesPanel.prototype = {
         data.push(Number.secondsToString(resource.timing.sendDuration));
 
         data.push(WebInspector.UIString("Waiting"));
-        data.push(Number.secondsToString(resource.timing.waitDuration));
+        // Waiting includes SSL, subtract it here.
+        var waitDuration = resource.timing.waitDuration;
+        if (resource.timing.sslDuration !== -1)
+            waitDuration -= resource.timing.sslDuration;
+        data.push(Number.secondsToString(waitDuration));
 
         data.push(WebInspector.UIString("Receiving"));
         data.push(Number.secondsToString(resource.endTime - resource.responseReceivedTime));

-- 
WebKit Debian packaging