PlzNavigate: Support ResourceTiming API

third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
index 1e493de46d724485056e2a6dce127cda6eecf75c..08cfa072eca50acb1da03b57f07435e48edc9600 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -91,6 +91,13 @@ enum SriResourceIntegrityMismatchEvent {
         DEFINE_SINGLE_RESOURCE_HISTOGRAM(prefix, XSLStyleSheet)  \
     }
 
+bool IsCrossOrigin(const KURL& a, const KURL& b)
+{
+    RefPtr<SecurityOrigin> originA = SecurityOrigin::create(a);
+    RefPtr<SecurityOrigin> originB = SecurityOrigin::create(b);
+    return !originB->isSameSchemeHostPort(originA.get());
+}
+
 } // namespace
 
 static void RecordSriResourceIntegrityMismatchEvent(SriResourceIntegrityMismatchEvent event)
@@ -170,7 +177,10 @@ ResourceLoadPriority ResourceFetcher::computeLoadPriority(Resource::Type type, c
 
 static void populateResourceTiming(ResourceTimingInfo* info, Resource* resource)
 {
-    info->setInitialRequest(resource->resourceRequest());
+    KURL initialURL = resource->response().redirectResponses().isEmpty()
+        ? resource->resourceRequest().url()
+        : resource->response().redirectResponses()[0].url();
+    info->setInitialURL(initialURL);
     info->setFinalResponse(resource->response());
 }
 
@@ -611,7 +621,14 @@ void ResourceFetcher::storeResourceTimingInitiatorInformation(Resource* resource
         return;
 
     bool isMainResource = resource->getType() == Resource::MainResource;
-    std::unique_ptr<ResourceTimingInfo> info = ResourceTimingInfo::create(fetchInitiator, monotonicallyIncreasingTime(), isMainResource);
+
+    // The request can already be fetched in a previous navigation. Thus
+    // startTime must be set accordingly.
+    double startTime = resource->resourceRequest().navigationStartTime()
+        ? resource->resourceRequest().navigationStartTime()
+        : monotonicallyIncreasingTime();
+
+    std::unique_ptr<ResourceTimingInfo> info = ResourceTimingInfo::create(fetchInitiator, startTime, isMainResource);
 
     if (resource->isCacheValidator()) {
         const AtomicString& timingAllowOrigin = resource->response().httpHeaderField(HTTPNames::Timing_Allow_Origin);
@@ -943,6 +960,15 @@ void ResourceFetcher::didFinishLoading(Resource* resource, double finishTime, in
     DCHECK(finishReason == DidFinishFirstPartInMultipart || !m_nonBlockingLoaders.contains(resource->loader()));
 
     if (std::unique_ptr<ResourceTimingInfo> info = m_resourceTimingInfoMap.take(resource)) {
+
+        // Store redirect responses that were packed inside the final response.
+        const Vector<ResourceResponse>& responses = resource->response().redirectResponses();
+        for (size_t i = 0; i < responses.size(); ++i) {
+            const KURL& newURL = i + 1 < responses.size() ? KURL(responses[i + 1].url()) : resource->resourceRequest().url();
+            bool crossOrigin = IsCrossOrigin(responses[i].url(), newURL);
+            info->addRedirect(responses[i], crossOrigin);
+        }
+
         if (resource->response().isHTTP() && resource->response().httpStatusCode() < 400) {
             populateResourceTiming(info.get(), resource);
             info->setLoadFinishTime(finishTime);
@@ -1105,7 +1131,7 @@ static bool isManualRedirectFetchRequest(const ResourceRequest& request)
     return request.fetchRedirectMode() == WebURLRequest::FetchRedirectModeManual && request.requestContext() == WebURLRequest::RequestContextFetch;
 }
 
-bool ResourceFetcher::willFollowRedirect(Resource* resource, ResourceRequest& newRequest, const ResourceResponse& redirectResponse, int64_t encodedDataLength)
+bool ResourceFetcher::willFollowRedirect(Resource* resource, ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
 {
     if (!isManualRedirectFetchRequest(resource->resourceRequest())) {
         if (!context().canRequest(resource->getType(), newRequest, newRequest.url(), resource->options(), resource->isUnusedPreload(), FetchRequest::UseDefaultOriginRestrictionForType))
@@ -1129,10 +1155,8 @@ bool ResourceFetcher::willFollowRedirect(Resource* resource, ResourceRequest& ne
 
     ResourceTimingInfoMap::iterator it = m_resourceTimingInfoMap.find(resource);
     if (it != m_resourceTimingInfoMap.end()) {
-        RefPtr<SecurityOrigin> originalSecurityOrigin = SecurityOrigin::create(redirectResponse.url());
-        RefPtr<SecurityOrigin> redirectedSecurityOrigin = SecurityOrigin::create(newRequest.url());
-        bool crossOrigin = !redirectedSecurityOrigin->isSameSchemeHostPort(originalSecurityOrigin.get());
-        it->value->addRedirect(redirectResponse, encodedDataLength, crossOrigin);
+        bool crossOrigin = IsCrossOrigin(redirectResponse.url(), newRequest.url());
+        it->value->addRedirect(redirectResponse, crossOrigin);
     }
     newRequest.setAllowStoredCredentials(resource->options().allowCredentials == AllowStoredCredentials);
     willSendRequest(resource->identifier(), newRequest, redirectResponse, resource->options());