Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
index 93bda38fb033ca761dd43870b97be5b7e9d2c865..63bc689ea306d60b67567e3ac2f4c584970bb1e9 100644 |
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
@@ -323,15 +323,11 @@ void FrameFetchContext::prepareRequest(unsigned long identifier, ResourceRequest |
{ |
frame()->loader().applyUserAgent(request); |
frame()->loader().client()->dispatchWillSendRequest(m_documentLoader, identifier, request, redirectResponse); |
+ InspectorInstrumentation::prepareRequest(frame(), masterDocumentLoader(), request); |
} |
-void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo) |
+void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, const ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo) |
{ |
- // For initial requests, prepareRequest() is called in |
- // willStartLoadingResource(), before revalidation policy is determined. |
- // That call doesn't exist for redirects, so call preareRequest() here. |
- if (!redirectResponse.isNull()) |
- prepareRequest(identifier, request, redirectResponse); |
TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, "data", InspectorSendRequestEvent::data(identifier, frame(), request)); |
InspectorInstrumentation::willSendRequest(frame(), identifier, masterDocumentLoader(), request, redirectResponse, initiatorInfo); |
if (frame()->frameScheduler()) |
@@ -421,7 +417,6 @@ void FrameFetchContext::willStartLoadingResource(unsigned long identifier, Resou |
{ |
TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", identifier, "data", loadResourceTraceData(identifier, request.url(), request.priority())); |
frame()->loader().progress().willStartLoading(identifier); |
- prepareRequest(identifier, request, ResourceResponse()); |
if (!m_documentLoader || m_documentLoader->fetcher()->archive() || !request.url().isValid()) |
return; |