[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 2d1c13f4244cab112deb67db05f048ca17216765
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 16 16:00:40 2010 +0000

    2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: add SSL time label into the resources popover.
    
            https://bugs.webkit.org/show_bug.cgi?id=42458
    
            * English.lproj/localizedStrings.js:
            * inspector/InspectorResource.cpp:
            (WebCore::InspectorResource::buildObjectForTiming):
            * inspector/front-end/ResourcesPanel.js:
            (WebInspector.ResourcesPanel.prototype._showPopover):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0fc0719..d1652ae 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -32,6 +32,20 @@
 
         Reviewed by Yury Semikhatsky.
 
+        Web Inspector: add SSL time label into the resources popover.
+
+        https://bugs.webkit.org/show_bug.cgi?id=42458
+
+        * English.lproj/localizedStrings.js:
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::buildObjectForTiming):
+        * inspector/front-end/ResourcesPanel.js:
+        (WebInspector.ResourcesPanel.prototype._showPopover):
+
+2010-07-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
         Web Inspector: disable AppCache in chromium.
 
         https://bugs.webkit.org/show_bug.cgi?id=41858
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index e624b16..8891a3c 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index e61074d..6a5919c 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -397,7 +397,7 @@ ScriptObject InspectorResource::buildObjectForTiming(InspectorFrontend* frontend
     jsonObject.set("proxyDuration", timing->proxyStart == -1 ? -1 : (timing->proxyEnd - timing->proxyStart) / 1000.0);
     jsonObject.set("dnsDuration", timing->dnsStart == -1 ? -1 : (timing->dnsEnd - timing->dnsStart) / 1000.0);
     jsonObject.set("connectDuration", timing->connectStart == -1 ? -1 : (timing->connectEnd - timing->connectStart) / 1000.0);
-    jsonObject.set("sslDuration", (timing->sslEnd - timing->sslStart) / 1000.0);
+    jsonObject.set("sslDuration", timing->sslStart == -1 ? -1 : (timing->sslEnd - timing->sslStart) / 1000.0);
     jsonObject.set("sendDuration", (timing->sendEnd - timing->sendStart) / 1000.0);
     jsonObject.set("waitDuration", (timing->receiveHeadersEnd - timing->sendEnd)  / 1000.0);
     return jsonObject;
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 2ea6b4f..f3dfdfe 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -764,11 +764,22 @@ WebInspector.ResourcesPanel.prototype = {
         }
 
         if (resource.timing.connectDuration !== -1) {
-            if (resource.connectionReused)
+            if (resource.connectionReused) {
                 data.push(WebInspector.UIString("Blocking"));
-            else
+                data.push(Number.secondsToString(resource.timing.connectDuration));
+            } else {
                 data.push(WebInspector.UIString("Connecting"));
-            data.push(Number.secondsToString(resource.timing.connectDuration));
+                // Connection includes DNS, subtract it here.
+                var connectDuration = resource.timing.connectDuration;
+                if (resource.timing.dnsDuration !== -1)
+                    connectDuration -= resource.timing.dnsDuration;
+                data.push(Number.secondsToString(connectDuration));
+            }
+        }
+
+        if (resource.timing.sslDuration !== -1) {
+            data.push(WebInspector.UIString("SSL"));
+            data.push(Number.secondsToString(resource.timing.sslDuration));
         }
 
         data.push(WebInspector.UIString("Sending"));

-- 
WebKit Debian packaging