DevTools: Move network request instrumentation points for timeline down the stack.

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/loader/FrameFetchContext.h"
 
+#include <algorithm>
+#include <memory>

[caseq, 2017/02/21 22:53:30]

add blank line

[alph, 2017/02/22 00:31:32]

Done.

 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/V8DOMActivityLogger.h"
 #include "core/dom/Document.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
@@ skipping 14 matching lines @@
 #include "core/loader/PingLoader.h"
 #include "core/loader/ProgressTracker.h"
 #include "core/loader/appcache/ApplicationCacheHost.h"
 #include "core/page/NetworkStateNotifier.h"
 #include "core/page/Page.h"
 #include "core/paint/FirstMeaningfulPaintDetector.h"
 #include "core/svg/graphics/SVGImageChromeClient.h"
 #include "core/timing/DOMWindowPerformance.h"
 #include "core/timing/Performance.h"
 #include "platform/WebFrameScheduler.h"
+#include "platform/instrumentation/inspector/PlatformInspectorTraceEvents.h"
 #include "platform/instrumentation/tracing/TracedValue.h"
 #include "platform/loader/fetch/ClientHintsPreferences.h"
 #include "platform/loader/fetch/FetchInitiatorTypeNames.h"
 #include "platform/loader/fetch/Resource.h"
 #include "platform/loader/fetch/ResourceLoadingLog.h"
 #include "platform/loader/fetch/UniqueIdentifier.h"
 #include "platform/mhtml/MHTMLArchive.h"
 #include "platform/network/NetworkUtils.h"
 #include "platform/network/ResourceLoadPriority.h"
 #include "platform/network/ResourceTimingInfo.h"
 #include "platform/weborigin/SchemeRegistry.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebDocumentSubresourceFilter.h"
 #include "public/platform/WebInsecureRequestPolicy.h"
 #include "public/platform/WebViewScheduler.h"
 #include "wtf/Vector.h"
-#include <algorithm>
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 void emitWarningForDocWriteScripts(const String& url, Document& document) {
   String message =
       "A Parser-blocking, cross site (i.e. different eTLD+1) script, " + url +
       ", is invoked via document.write. This MAY be blocked by "
       "the browser in this or a future page load due to poor network "
@@ skipping 367 matching lines @@
 void FrameFetchContext::dispatchDidReceiveData(unsigned long identifier,
                                                const char* data,
                                                int dataLength) {
   frame()->loader().progress().incrementProgress(identifier, dataLength);
   InspectorInstrumentation::didReceiveData(frame(), identifier, data,
                                            dataLength);
 }
 
 void FrameFetchContext::dispatchDidReceiveEncodedData(unsigned long identifier,
                                                       int encodedDataLength) {
-  TRACE_EVENT1(
-      "devtools.timeline", "ResourceReceivedData", "data",
-      InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
+  TRACE_EVENT1("devtools.timeline", "ResourceReceivedData", "data",
+               InspectorReceiveDataEvent::data(identifier, encodedDataLength));
   InspectorInstrumentation::didReceiveEncodedDataLength(frame(), identifier,
                                                         encodedDataLength);
 }
 
 void FrameFetchContext::dispatchDidDownloadData(unsigned long identifier,
                                                 int dataLength,
                                                 int encodedDataLength) {
-  TRACE_EVENT1(
-      "devtools.timeline", "ResourceReceivedData", "data",
-      InspectorReceiveDataEvent::data(identifier, frame(), encodedDataLength));
+  TRACE_EVENT1("devtools.timeline", "ResourceReceivedData", "data",
+               InspectorReceiveDataEvent::data(identifier, encodedDataLength));
   frame()->loader().progress().incrementProgress(identifier, dataLength);
   InspectorInstrumentation::didReceiveData(frame(), identifier, 0, dataLength);
   InspectorInstrumentation::didReceiveEncodedDataLength(frame(), identifier,
                                                         encodedDataLength);
 }
 
 void FrameFetchContext::dispatchDidFinishLoading(unsigned long identifier,
                                                  double finishTime,
                                                  int64_t encodedDataLength) {
-  TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
-               InspectorResourceFinishEvent::data(identifier, finishTime, false,
-                                                  encodedDataLength));
   frame()->loader().progress().completeProgress(identifier);
   InspectorInstrumentation::didFinishLoading(frame(), identifier, finishTime,
                                              encodedDataLength);
   if (frame()->frameScheduler())
     frame()->frameScheduler()->didStopLoading(identifier);
 }
 
 void FrameFetchContext::dispatchDidFail(unsigned long identifier,
                                         const ResourceError& error,
                                         int64_t encodedDataLength,
                                         bool isInternalRequest) {
-  TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
-               InspectorResourceFinishEvent::data(identifier, 0, true,
-                                                  encodedDataLength));
   frame()->loader().progress().completeProgress(identifier);
   InspectorInstrumentation::didFailLoading(frame(), identifier, error);
   // Notification to FrameConsole should come AFTER InspectorInstrumentation
   // call, DevTools front-end relies on this.
   if (!isInternalRequest)
     frame()->console().didFailLoading(identifier, error);
   if (frame()->frameScheduler())
     frame()->frameScheduler()->didStopLoading(identifier);
 }
 
 void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(
     unsigned long identifier,
     Resource* resource,
     WebURLRequest::FrameType frameType,
     WebURLRequest::RequestContext requestContext) {
   ResourceRequest request(resource->url());
   request.setFrameType(frameType);
   request.setRequestContext(requestContext);
   frameLoaderClient()->dispatchDidLoadResourceFromMemoryCache(
       request, resource->response());
   dispatchWillSendRequest(identifier, request, ResourceResponse(),
                           resource->options().initiatorInfo);
 
   InspectorInstrumentation::markResourceAsCached(frame(), identifier);
   if (!resource->response().isNull()) {
+    TRACE_EVENT1(
+        "devtools.timeline", "ResourceReceiveResponse", "data",
+        InspectorReceiveResponseEvent::data(identifier, resource->response()));
     dispatchDidReceiveResponseInternal(identifier, resource->response(),
                                        frameType, requestContext, resource,
                                        LinkLoader::DoNotLoadResources);
   }
 
   if (resource->encodedSize() > 0)
     dispatchDidReceiveData(identifier, 0, resource->encodedSize());
 
+  TRACE_EVENT1("devtools.timeline", "ResourceFinish", "data",
+               InspectorResourceFinishEvent::data(identifier, 0, false, 0));
   dispatchDidFinishLoading(identifier, 0, 0);
 }
 
 bool FrameFetchContext::shouldLoadNewResource(Resource::Type type) const {
   if (!m_documentLoader)
     return true;
 
   FrameLoader& loader = m_documentLoader->frame()->loader();
   if (type == Resource::MainResource)
     return m_documentLoader == loader.provisionalDocumentLoader();
@@ skipping 507 matching lines @@
   return frame()->frameScheduler()->loadingTaskRunner();
 }
 
 void FrameFetchContext::dispatchDidReceiveResponseInternal(
     unsigned long identifier,
     const ResourceResponse& response,
     WebURLRequest::FrameType frameType,
     WebURLRequest::RequestContext requestContext,
     Resource* resource,
     LinkLoader::CanLoadResources resourceLoadingPolicy) {
-  TRACE_EVENT1(
-      "devtools.timeline", "ResourceReceiveResponse", "data",
-      InspectorReceiveResponseEvent::data(identifier, frame(), response));
   MixedContentChecker::checkMixedPrivatePublic(frame(),
                                                response.remoteIPAddress());
   if (m_documentLoader &&
       m_documentLoader ==
           m_documentLoader->frame()->loader().provisionalDocumentLoader()) {
     FrameClientHintsPreferencesContext hintsContext(frame());
     m_documentLoader->clientHintsPreferences()
         .updateFromAcceptClientHintsHeader(
             response.httpHeaderField(HTTPNames::Accept_CH), &hintsContext);
     // When response is received with a provisional docloader, the resource
@@ skipping 20 matching lines @@
                                                     response);
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink