fixed encodedBodySize/decodedBodySize/name/initiatorType for nav timing 2

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

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
     rights reserved.
     Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ skipping 178 matching lines @@
 
   // A manually set priority acts as a floor. This is used to ensure that
   // synchronous requests are always given the highest possible priority, as
   // well as to ensure that there isn't priority churn if images move in and out
   // of the viewport, or is displayed more than once, both in and out of the
   // viewport.
   return std::max(context().modifyPriorityForExperiments(priority),
                   request.resourceRequest().priority());
 }
 
-static void populateResourceTiming(ResourceTimingInfo* info,
+static void populateTimingInfo(ResourceTimingInfo* info,
                                    Resource* resource) {
   KURL initialURL = resource->response().redirectResponses().isEmpty()
                         ? resource->resourceRequest().url()
                         : resource->response().redirectResponses()[0].url();
   info->setInitialURL(initialURL);
   info->setFinalResponse(resource->response());
 }
 
 static WebURLRequest::RequestContext requestContextFromType(
     bool isMainFrame,
@@ skipping 91 matching lines @@
   if (isStaticData)
     return;
 
   if (type == ResourceLoadingFromCache && !resource->stillNeedsLoad() &&
       !m_validatedURLs.contains(request.resourceRequest().url())) {
     // Resources loaded from memory cache should be reported the first time
     // they're used.
     std::unique_ptr<ResourceTimingInfo> info = ResourceTimingInfo::create(
         request.options().initiatorInfo.name, monotonicallyIncreasingTime(),
         resource->getType() == Resource::MainResource);
-    populateResourceTiming(info.get(), resource);
+    populateTimingInfo(info.get(), resource);
     info->clearLoadTimings();
     info->setLoadFinishTime(info->initialTime());
     m_scheduledResourceTimingReports.append(std::move(info));
     if (!m_resourceTimingReportTimer.isActive())
       m_resourceTimingReportTimer.startOneShot(0, BLINK_FROM_HERE);
   }
 
   if (m_validatedURLs.size() >= kMaxValidatedURLsSize) {
     m_validatedURLs.clear();
   }
@@ skipping 815 matching lines @@
   }
   DCHECK(!m_loaders.contains(loader));
 
   const int64_t encodedDataLength = resource->response().encodedDataLength();
 
   if (resource->getType() == Resource::MainResource) {
     DCHECK(m_navigationTimingInfo);
     // Store redirect responses that were packed inside the final response.
     addRedirectsToTimingInfo(resource, m_navigationTimingInfo.get());
     if (resource->response().isHTTP()) {
+      populateTimingInfo(m_navigationTimingInfo.get(), resource);
       m_navigationTimingInfo->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.
     addRedirectsToTimingInfo(resource, info.get());
 
     if (resource->response().isHTTP() &&
         resource->response().httpStatusCode() < 400) {
-      populateResourceTiming(info.get(), resource);
+      populateTimingInfo(info.get(), resource);
       info->setLoadFinishTime(finishTime);
       // encodedDataLength == -1 means "not available".
       // TODO(ricea): Find cases where it is not available but the
       // PerformanceResourceTiming spec requires it to be available and fix
       // them.
       info->addFinalTransferSize(encodedDataLength == -1 ? 0
                                                          : encodedDataLength);
 
       if (resource->options().requestInitiatorContext == DocumentContext)
         context().addResourceTiming(*info);
@@ skipping 353 matching lines @@
   visitor->trace(m_context);
   visitor->trace(m_archive);
   visitor->trace(m_loaders);
   visitor->trace(m_nonBlockingLoaders);
   visitor->trace(m_documentResources);
   visitor->trace(m_preloads);
   visitor->trace(m_resourceTimingInfoMap);
 }
 
 }  // namespace blink