Merge 80043

Source/WebCore/loader/MainResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 40 matching lines @@
 
 // FIXME: More that is in common with SubresourceLoader should move up into ResourceLoader.
 
 namespace WebCore {
 
 MainResourceLoader::MainResourceLoader(Frame* frame)
     : ResourceLoader(frame, true, true)
     , m_dataLoadTimer(this, &MainResourceLoader::handleDataLoadNow)
     , m_loadingMultipartContent(false)
     , m_waitingForContentPolicy(false)
+    , m_timeOfLastDataReceived(0.0)
 {
 }
 
 MainResourceLoader::~MainResourceLoader()
 {
 }
 
 PassRefPtr<MainResourceLoader> MainResourceLoader::create(Frame* frame)
 {
     return adoptRef(new MainResourceLoader(frame));
@@ skipping 381 matching lines @@
     
     // The additional processing can do anything including possibly removing the last
     // reference to this object.
     RefPtr<MainResourceLoader> protect(this);
 
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     RefPtr<DocumentLoader> dl = documentLoader();
 #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);
     
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     dl->applicationCacheHost()->finishedLoadingMainResource();
 #endif
 }
 
 void MainResourceLoader::didFail(const ResourceError& error)
 {
@@ skipping 142 matching lines @@
             startDataLoadTimer();
         else {
             ResourceRequest r(m_initialRequest);
             m_initialRequest = ResourceRequest();
             loadNow(r);
         }
     }
 }
 
 }