Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / fetch / ResourceFetcher.cpp

diff --git a/src/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/src/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index f82d3bd..cce718c 100644 (file)
--- a/src/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/src/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -169,9 +169,12 @@ static void populateResourceTiming(ResourceTimingInfo* info, Resource* resource,
 {
     info->setInitialRequest(resource->resourceRequest());
     info->setFinalResponse(resource->response());
-    if (clearLoadTimings)
+    if (clearLoadTimings) {
         info->clearLoadTimings();
-    info->setLoadFinishTime(resource->loadFinishTime());
+        info->setLoadFinishTime(info->initialTime());
+    } else {
+        info->setLoadFinishTime(resource->loadFinishTime());
+    }
 }
 
 static void reportResourceTiming(ResourceTimingInfo* info, Document* initiatorDocument, bool isMainResource)