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 fa07761e50d8d6c459cc42e5cac64ca0082c2e14..18d39f40a63574ac9922f4f540d963abd384ad4c 100644 |
--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp |
@@ -247,12 +247,13 @@ void FrameFetchContext::dispatchDidChangeResourcePriority(unsigned long identifi |
frame()->loader().client()->dispatchDidChangeResourcePriority(identifier, loadPriority, intraPriorityValue); |
} |
-void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& initiatorInfo) |
+void FrameFetchContext::dispatchWillSendRequest(const Resource* resource, ResourceRequest& request, const ResourceResponse& redirectResponse) |
{ |
+ frame()->loader().progress().willSendRequest(resource); |
frame()->loader().applyUserAgent(request); |
- frame()->loader().client()->dispatchWillSendRequest(m_documentLoader, identifier, request, redirectResponse); |
- TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, "data", InspectorSendRequestEvent::data(identifier, frame(), request)); |
- InspectorInstrumentation::willSendRequest(frame(), identifier, ensureLoaderForNotifications(), request, redirectResponse, initiatorInfo); |
+ frame()->loader().client()->dispatchWillSendRequest(m_documentLoader, resource->identifier(), request, redirectResponse); |
+ TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceSendRequest", TRACE_EVENT_SCOPE_THREAD, "data", InspectorSendRequestEvent::data(resource->identifier(), frame(), request)); |
+ InspectorInstrumentation::willSendRequest(frame(), resource->identifier(), ensureLoaderForNotifications(), request, redirectResponse, resource->options().initiatorInfo); |
} |
void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, const ResourceResponse& response, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext, ResourceLoader* resourceLoader) |
@@ -320,7 +321,7 @@ void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const Resource* r |
ResourceRequest request(resource->url()); |
unsigned long identifier = createUniqueIdentifier(); |
frame()->loader().client()->dispatchDidLoadResourceFromMemoryCache(request, resource->response()); |
- dispatchWillSendRequest(identifier, request, ResourceResponse(), resource->options().initiatorInfo); |
+ dispatchWillSendRequest(resource, request, ResourceResponse()); |
InspectorInstrumentation::markResourceAsCached(frame(), identifier); |
if (!resource->response().isNull()) |