[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 9a5c5127208223040123bf87de870df5a59095ce
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 19:17:46 2010 +0000

    2010-09-16  Pavel Feldman  <pfeldman at chromium.org>
    
            Reviewed by Yury Semikhatsky.
    
            Web Inspector: Prevent responseReceivedTime from being > endTime in case mixture of WebCore and Network stack info is used.
            https://bugs.webkit.org/show_bug.cgi?id=45892
    
            * inspector/InspectorResource.cpp:
            (WebCore::InspectorResource::endTiming):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67648 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e0140c6..5104694 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-16  Pavel Feldman  <pfeldman at chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: Prevent responseReceivedTime from being > endTime in case mixture of WebCore and Network stack info is used.
+        https://bugs.webkit.org/show_bug.cgi?id=45892
+
+        * inspector/InspectorResource.cpp:
+        (WebCore::InspectorResource::endTiming):
+
 2010-09-16  Ilya Tikhonovsky  <loislo at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/inspector/InspectorResource.cpp b/WebCore/inspector/InspectorResource.cpp
index 2d24c4e..814ee55 100644
--- a/WebCore/inspector/InspectorResource.cpp
+++ b/WebCore/inspector/InspectorResource.cpp
@@ -457,7 +457,16 @@ void InspectorResource::startTiming()
 
 void InspectorResource::endTiming(double actualEndTime)
 {
-    m_endTime = actualEndTime ? actualEndTime : currentTime();
+    if (actualEndTime) {
+        m_endTime = actualEndTime;
+        // In case of fast load (or in case of cached resources), endTime on network stack
+        // can be less then m_responseReceivedTime measured in WebCore. Normalize it here,
+        // prefer actualEndTime to m_responseReceivedTime.
+        if (m_endTime < m_responseReceivedTime)
+            m_responseReceivedTime = m_endTime;
+    } else
+        m_endTime = currentTime();
+
     m_finished = true;
     m_changes.set(TimingChange);
     m_changes.set(CompletionChange);

-- 
WebKit Debian packaging