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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c88a3539cc7b0406ffef9459b7ac80c79a240f70
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 17:56:19 2010 +0000

    2010-10-07  James Simonsen  <simonjam at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            [Web Timing] Use platform definition of responseEnd
            https://bugs.webkit.org/show_bug.cgi?id=46306
    
            No new tests. Used existing webtiming test.
    
            * loader/MainResourceLoader.cpp:
            (WebCore::MainResourceLoader::didFinishLoading):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 555a8aa..78aa024 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-07  James Simonsen  <simonjam at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [Web Timing] Use platform definition of responseEnd
+        https://bugs.webkit.org/show_bug.cgi?id=46306
+
+        No new tests. Used existing webtiming test.
+
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::didFinishLoading):
+
 2010-10-05  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebCore/loader/MainResourceLoader.cpp b/WebCore/loader/MainResourceLoader.cpp
index bc16001..af30a11 100644
--- a/WebCore/loader/MainResourceLoader.cpp
+++ b/WebCore/loader/MainResourceLoader.cpp
@@ -453,7 +453,7 @@ void MainResourceLoader::didFinishLoading(double finishTime)
 #endif
 
     ASSERT(!documentLoader()->timing()->responseEnd);
-    documentLoader()->timing()->responseEnd = m_timeOfLastDataReceived;
+    documentLoader()->timing()->responseEnd = finishTime ? finishTime : m_timeOfLastDataReceived;
     frameLoader()->finishedLoading();
     ResourceLoader::didFinishLoading(finishTime);
     

-- 
WebKit Debian packaging