Merge 80043

Source/WebCore/loader/MainResourceLoader.cpp

Index: Source/WebCore/loader/MainResourceLoader.cpp
===================================================================
--- Source/WebCore/loader/MainResourceLoader.cpp	(revision 81432)
+++ Source/WebCore/loader/MainResourceLoader.cpp	(working copy)
@@ -58,6 +58,7 @@
     , m_dataLoadTimer(this, &MainResourceLoader::handleDataLoadNow)
     , m_loadingMultipartContent(false)
     , m_waitingForContentPolicy(false)
+    , m_timeOfLastDataReceived(0.0)
 {
 }
 
@@ -459,7 +460,7 @@
 #endif
 
     ASSERT(!documentLoader()->timing()->responseEnd);
-    documentLoader()->timing()->responseEnd = finishTime ? finishTime : m_timeOfLastDataReceived;
+    documentLoader()->timing()->responseEnd = finishTime ? finishTime : (m_timeOfLastDataReceived ? m_timeOfLastDataReceived : currentTime());
     frameLoader()->finishedLoading();
     ResourceLoader::didFinishLoading(finishTime);