transferSize implementation

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 1c9fd3a59b1b6274383c87e2b2060006e5405300..983bad28e1153b706cdaa311cf85b4a8b1ca7750 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -103,6 +103,20 @@ bool IsCrossOrigin(const KURL& a, const KURL& b) {
   return !originB->isSameSchemeHostPort(originA.get());
 }
 
+void addRedirectsToResourceTimingInfo(Resource* resource,
+                                      ResourceTimingInfo* info) {
+  // 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);
+  }
+}
+
 }  // namespace
 
 static void RecordSriResourceIntegrityMismatchEvent(
@@ -243,6 +257,7 @@ ResourceFetcher::ResourceFetcher(FetchContext* newContext)
       m_resourceTimingReportTimer(
           this,
           &ResourceFetcher::resourceTimingReportTimerFired),
+      m_mainResourceIdentifier(0),

[Yoav Weiss, 2016/12/02 07:42:49]

This assumes a resource's identifier is never 0. Seems like current
implementation does support that assumption, but it might be worth while to make
that assumption explicit. (e.g. by DCHECKing input identifiers here)

[sunjian, 2016/12/03 00:16:50]

So getMainResourceTimingInfo() doesn't take any identifier any more. I am not
sure whether that's where you want me to add the DCHECK or not?

       m_autoLoadImages(true),
       m_imagesEnabled(true),
       m_allowStaleResources(false),
@@ -752,7 +767,7 @@ Resource* ResourceFetcher::createResourceForLoading(
   return resource;
 }
 
-void ResourceFetcher::storeResourceTimingInitiatorInformation(
+void ResourceFetcher::storePerformanceTimingInitiatorInformation(
     Resource* resource) {
   const AtomicString& fetchInitiator = resource->options().initiatorInfo.name;
   if (fetchInitiator == FetchInitiatorTypeNames::internal)
@@ -777,8 +792,13 @@ void ResourceFetcher::storeResourceTimingInitiatorInformation(
   }
 
   if (!isMainResource ||
-      context().updateTimingInfoForIFrameNavigation(info.get()))
+      context().updateTimingInfoForIFrameNavigation(info.get())) {
     m_resourceTimingInfoMap.add(resource, std::move(info));
+  } else {
+    DCHECK(!m_mainResourceTimingInfo);
+    m_mainResourceTimingInfo = std::move(info);
+    m_mainResourceIdentifier = resource->identifier();
+  }
 }
 
 ResourceFetcher::RevalidationPolicy
@@ -1120,6 +1140,12 @@ ArchiveResource* ResourceFetcher::createArchive(Resource* resource) {
   return m_archive ? m_archive->mainResource() : nullptr;
 }
 
+ResourceTimingInfo* ResourceFetcher::getMainResourceTimingInfo() {
+  DCHECK(m_mainResourceTimingInfo);
+  DCHECK(m_mainResourceIdentifier);
+  return m_mainResourceTimingInfo.get();
+}
+
 void ResourceFetcher::didFinishLoading(Resource* resource,
                                        double finishTime,
                                        DidFinishLoadingReason finishReason) {
@@ -1138,18 +1164,18 @@ void ResourceFetcher::didFinishLoading(Resource* resource,
   DCHECK(finishReason == DidFinishFirstPartInMultipart ||
          !m_nonBlockingLoaders.contains(resource->loader()));
 
+  if (resource->getType() == Resource::MainResource &&
+      m_mainResourceTimingInfo) {
+    DCHECK_EQ(resource->identifier(), m_mainResourceIdentifier);
+    // Store redirect responses that were packed inside the final response.
+    addRedirectsToResourceTimingInfo(resource, m_mainResourceTimingInfo.get());
+    m_mainResourceTimingInfo->addFinalTransferSize(
+        encodedDataLength == -1 ? 0 : encodedDataLength);
+  }
   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);
-    }
+    addRedirectsToResourceTimingInfo(resource, info.get());
 
     if (resource->response().isHTTP() &&
         resource->response().httpStatusCode() < 400) {
@@ -1314,7 +1340,7 @@ bool ResourceFetcher::startLoad(Resource* resource) {
   else
     m_nonBlockingLoaders.add(loader);
 
-  storeResourceTimingInitiatorInformation(resource);
+  storePerformanceTimingInitiatorInformation(resource);
   resource->setFetcherSecurityOrigin(sourceOrigin);
 
   loader->activateCacheAwareLoadingIfNeeded(request);
@@ -1403,6 +1429,14 @@ bool ResourceFetcher::willFollowRedirect(
     bool crossOrigin = IsCrossOrigin(redirectResponse.url(), newRequest.url());
     it->value->addRedirect(redirectResponse, crossOrigin);
   }
+
+  if (resource->getType() == Resource::MainResource &&
+      m_mainResourceTimingInfo) {
+    DCHECK_EQ(resource->identifier(), m_mainResourceIdentifier);
+    bool crossOrigin = IsCrossOrigin(redirectResponse.url(), newRequest.url());
+    m_mainResourceTimingInfo->addRedirect(redirectResponse, crossOrigin);
+  }
+
   newRequest.setAllowStoredCredentials(resource->options().allowCredentials ==
                                        AllowStoredCredentials);
   willSendRequest(resource->identifier(), newRequest, redirectResponse,