Revert of Show service worker navigation preload requests in DevTools Network tab

third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

 /*
  * Copyright (C) 2011 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 558 matching lines @@
   return false;
 }
 
 void InspectorNetworkAgent::didBlockRequest(
     LocalFrame* frame,
     const ResourceRequest& request,
     DocumentLoader* loader,
     const FetchInitiatorInfo& initiatorInfo,
     ResourceRequestBlockedReason reason) {
   unsigned long identifier = createUniqueIdentifier();
-  willSendRequestInternal(identifier, loader, request, ResourceResponse(),
-                          initiatorInfo);
+  willSendRequestInternal(frame, identifier, loader, request,
+                          ResourceResponse(), initiatorInfo);
 
   String requestId = IdentifiersFactory::requestId(identifier);
   String protocolReason = buildBlockedReason(reason);
   frontend()->loadingFailed(requestId, monotonicallyIncreasingTime(),
                             InspectorPageAgent::resourceTypeJson(
                                 m_resourcesData->resourceType(requestId)),
                             String(), false, protocolReason);
 }
 
 void InspectorNetworkAgent::didChangeResourcePriority(
     unsigned long identifier,
     ResourceLoadPriority loadPriority) {
   String requestId = IdentifiersFactory::requestId(identifier);
   frontend()->resourceChangedPriority(requestId,
                                       resourcePriorityJSON(loadPriority),
                                       monotonicallyIncreasingTime());
 }
 
 void InspectorNetworkAgent::willSendRequestInternal(
+    LocalFrame* frame,
     unsigned long identifier,
     DocumentLoader* loader,
     const ResourceRequest& request,
     const ResourceResponse& redirectResponse,
     const FetchInitiatorInfo& initiatorInfo) {
   String requestId = IdentifiersFactory::requestId(identifier);
-  String loaderId = loader ? IdentifiersFactory::loaderId(loader) : "";
+  String loaderId = IdentifiersFactory::loaderId(loader);
   m_resourcesData->resourceCreated(requestId, loaderId, request.url());
 
   InspectorPageAgent::ResourceType type = InspectorPageAgent::OtherResource;
   if (initiatorInfo.name == FetchInitiatorTypeNames::xmlhttprequest) {
     type = InspectorPageAgent::XHRResource;
     m_resourcesData->setResourceType(requestId, type);
   } else if (initiatorInfo.name == FetchInitiatorTypeNames::document) {
     type = InspectorPageAgent::DocumentResource;
     m_resourcesData->setResourceType(requestId, type);
   }
 
-  String frameId = loader && loader->frame()
-                       ? IdentifiersFactory::frameId(loader->frame())
-                       : "";
-  std::unique_ptr<protocol::Network::Initiator> initiatorObject;
-  if (loader) {
-    initiatorObject = buildInitiatorObject(
-        loader->frame() ? loader->frame()->document() : 0, initiatorInfo);
-  } else {
-    initiatorObject =
-        protocol::Network::Initiator::create()
-            .setType(protocol::Network::Initiator::TypeEnum::Preload)
-            .build();
-  }
-
+  String frameId =
+      loader->frame() ? IdentifiersFactory::frameId(loader->frame()) : "";
+  std::unique_ptr<protocol::Network::Initiator> initiatorObject =
+      buildInitiatorObject(loader->frame() ? loader->frame()->document() : 0,
+                           initiatorInfo);
   if (initiatorInfo.name == FetchInitiatorTypeNames::document) {
     FrameNavigationInitiatorMap::iterator it =
         m_frameNavigationInitiatorMap.find(frameId);
     if (it != m_frameNavigationInitiatorMap.end())
       initiatorObject = it->value->clone();
   }
 
   std::unique_ptr<protocol::Network::Request> requestInfo(
       buildObjectForResourceRequest(request));
 
-  if (loader) {
-    requestInfo->setMixedContentType(mixedContentTypeForContextType(
-        MixedContentChecker::contextTypeForInspector(loader->frame(),
-                                                     request)));
-  }
+  requestInfo->setMixedContentType(mixedContentTypeForContextType(
+      MixedContentChecker::contextTypeForInspector(frame, request)));
 
   requestInfo->setReferrerPolicy(referrerPolicy(request.getReferrerPolicy()));
 
   String resourceType = InspectorPageAgent::resourceTypeJson(type);
   frontend()->requestWillBeSent(
       requestId, frameId, loaderId,
-      loader ? urlWithoutFragment(loader->url()).getString() : "",
-      std::move(requestInfo), monotonicallyIncreasingTime(), currentTime(),
-      std::move(initiatorObject),
+      urlWithoutFragment(loader->url()).getString(), std::move(requestInfo),
+      monotonicallyIncreasingTime(), currentTime(), std::move(initiatorObject),
       buildObjectForResourceResponse(redirectResponse), resourceType);
   if (m_pendingXHRReplayData && !m_pendingXHRReplayData->async())
     frontend()->flush();
 }
 
 void InspectorNetworkAgent::willSendRequest(
+    LocalFrame* frame,
     unsigned long identifier,
     DocumentLoader* loader,
     ResourceRequest& request,
     const ResourceResponse& redirectResponse,
     const FetchInitiatorInfo& initiatorInfo) {
   // Ignore the request initiated internally.
   if (initiatorInfo.name == FetchInitiatorTypeNames::internal)
     return;
 
   if (initiatorInfo.name == FetchInitiatorTypeNames::document &&
@@ skipping 19 matching lines @@
         request.requestContext() != WebURLRequest::RequestContextInternal) {
       request.setCachePolicy(WebCachePolicy::BypassCacheLoadOnlyFromCache);
     } else {
       request.setCachePolicy(WebCachePolicy::BypassingCache);
     }
     request.setShouldResetAppCache(true);
   }
   if (m_state->booleanProperty(NetworkAgentState::bypassServiceWorker, false))
     request.setSkipServiceWorker(WebURLRequest::SkipServiceWorker::All);
 
-  willSendRequestInternal(identifier, loader, request, redirectResponse,
+  willSendRequestInternal(frame, identifier, loader, request, redirectResponse,
                           initiatorInfo);
 
   if (!m_hostId.isEmpty())
     request.addHTTPHeaderField(
         HTTPNames::X_DevTools_Emulate_Network_Conditions_Client_Id,
         AtomicString(m_hostId));
 }
 
 void InspectorNetworkAgent::markResourceAsCached(unsigned long identifier) {
   frontend()->requestServedFromCache(IdentifiersFactory::requestId(identifier));
 }
 
 void InspectorNetworkAgent::didReceiveResourceResponse(
-    ExecutionContext* context,
+    LocalFrame* frame,
     unsigned long identifier,
     DocumentLoader* loader,
     const ResourceResponse& response,
     Resource* cachedResource) {
   String requestId = IdentifiersFactory::requestId(identifier);
   bool isNotModified = response.httpStatusCode() == 304;
 
   bool resourceIsEmpty = true;
   std::unique_ptr<protocol::Network::Response> resourceResponse =
       buildObjectForResourceResponse(response, cachedResource,
@@ skipping 15 matching lines @@
   if (type == InspectorPageAgent::DocumentResource && loader &&
       loader->substituteData().isValid())
     return;
 
   // Resources are added to NetworkResourcesData as a WeakMember here and
   // removed in willDestroyResource() called in the prefinalizer of Resource.
   // Because NetworkResourceData retains weak references only, it
   // doesn't affect Resource lifetime.
   if (cachedResource)
     m_resourcesData->addResource(requestId, cachedResource);
-  String frameId =
-      context->isDocument()
-          ? IdentifiersFactory::frameId(toDocument(context)->frame())
-          : "";
+  String frameId = IdentifiersFactory::frameId(frame);
   String loaderId = loader ? IdentifiersFactory::loaderId(loader) : "";
   m_resourcesData->responseReceived(requestId, frameId, response);
   m_resourcesData->setResourceType(requestId, type);
 
   if (response.getSecurityStyle() != ResourceResponse::SecurityStyleUnknown &&
       response.getSecurityStyle() !=
           ResourceResponse::SecurityStyleUnauthenticated) {
     const ResourceResponse::SecurityDetails* responseSecurityDetails =
         response.getSecurityDetails();
     m_resourcesData->setCertificate(requestId,
                                     responseSecurityDetails->certificate);
   }
 
   if (resourceResponse && !resourceIsEmpty)
     frontend()->responseReceived(requestId, frameId, loaderId,
                                  monotonicallyIncreasingTime(),
                                  InspectorPageAgent::resourceTypeJson(type),
                                  std::move(resourceResponse));
   // If we revalidated the resource and got Not modified, send content length
   // following didReceiveResponse as there will be no calls to didReceiveData
   // from the network stack.
   if (isNotModified && cachedResource && cachedResource->encodedSize())
-    didReceiveData(identifier, 0, cachedResource->encodedSize());
+    didReceiveData(frame, identifier, 0, cachedResource->encodedSize());
 }
 
 static bool isErrorStatusCode(int statusCode) {
   return statusCode >= 400;
 }
 
-void InspectorNetworkAgent::didReceiveData(unsigned long identifier,
+void InspectorNetworkAgent::didReceiveData(LocalFrame*,
+                                           unsigned long identifier,
                                            const char* data,
                                            int dataLength) {
   String requestId = IdentifiersFactory::requestId(identifier);
 
   if (data) {
     NetworkResourcesData::ResourceData const* resourceData =
         m_resourcesData->data(requestId);
     if (resourceData &&
         (!resourceData->cachedResource() ||
          resourceData->cachedResource()->getDataBufferingPolicy() ==
@@ skipping 44 matching lines @@
                               encodedDataLength);
 }
 
 void InspectorNetworkAgent::didReceiveCORSRedirectResponse(
     LocalFrame* frame,
     unsigned long identifier,
     DocumentLoader* loader,
     const ResourceResponse& response,
     Resource* resource) {
   // Update the response and finish loading
-  didReceiveResourceResponse(frame->document(), identifier, loader, response,
-                             resource);
+  didReceiveResourceResponse(frame, identifier, loader, response, resource);
   didFinishLoading(identifier, 0,
                    WebURLLoaderClient::kUnknownEncodedDataLength);
 }
 
 void InspectorNetworkAgent::didFailLoading(unsigned long identifier,
                                            const ResourceError& error) {
   String requestId = IdentifiersFactory::requestId(identifier);
   bool canceled = error.isCancellation();
   frontend()->loadingFailed(requestId, monotonicallyIncreasingTime(),
                             InspectorPageAgent::resourceTypeJson(
@@ skipping 685 matching lines @@
       m_isRecalculatingStyle(false),
       m_removeFinishedReplayXHRTimer(
           this,
           &InspectorNetworkAgent::removeFinishedReplayXHRFired) {}
 
 bool InspectorNetworkAgent::shouldForceCORSPreflight() {
   return m_state->booleanProperty(NetworkAgentState::cacheDisabled, false);
 }
 
 }  // namespace blink