Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

Unified Diff: third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp

Issue 2649923007: Revert of Show service worker navigation preload requests in DevTools Network tab (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
index 2e99003455bf0d7014d88802b547ae4784af29b5..d7e282c63ab5b6d7b0a77a658c17b2c62991ace6 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorNetworkAgent.cpp
@@ -576,8 +576,8 @@
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);
@@ -597,13 +597,14 @@
}
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;
@@ -615,20 +616,11 @@
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);
@@ -639,26 +631,23 @@
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,
@@ -698,7 +687,7 @@
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())
@@ -712,7 +701,7 @@
}
void InspectorNetworkAgent::didReceiveResourceResponse(
- ExecutionContext* context,
+ LocalFrame* frame,
unsigned long identifier,
DocumentLoader* loader,
const ResourceResponse& response,
@@ -748,10 +737,7 @@
// 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);
@@ -774,14 +760,15 @@
// 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);
@@ -846,8 +833,7 @@
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);
}

Powered by Google App Engine
This is Rietveld 408576698