| 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 17bfc33d25547ed9cc7f4d10fc25accad84c2389..9b194849cab81288c843865581330dfb625278a2 100644
|
| --- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| +++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp
|
| @@ -299,7 +299,7 @@ void FrameFetchContext::dispatchWillSendRequest(unsigned long identifier, Resour
|
| InspectorInstrumentation::willSendRequest(frame(), identifier, ensureLoaderForNotifications(), request, redirectResponse, initiatorInfo);
|
| }
|
|
|
| -void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, const ResourceResponse& response, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext, ResourceLoader* resourceLoader)
|
| +void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, const ResourceResponse& response, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext, Resource* resource)
|
| {
|
| LinkLoader::CanLoadResources resourceLoadingPolicy = LinkLoader::LoadResourcesAndPreconnect;
|
| MixedContentChecker::checkMixedPrivatePublic(frame(), response.remoteIPAddress());
|
| @@ -320,7 +320,7 @@ void FrameFetchContext::dispatchDidReceiveResponse(unsigned long identifier, con
|
| frame()->loader().client()->dispatchDidReceiveResponse(m_documentLoader, identifier, response);
|
| TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceReceiveResponse", TRACE_EVENT_SCOPE_THREAD, "data", InspectorReceiveResponseEvent::data(identifier, frame(), response));
|
| DocumentLoader* documentLoader = ensureLoaderForNotifications();
|
| - InspectorInstrumentation::didReceiveResourceResponse(frame(), identifier, documentLoader, response, resourceLoader);
|
| + InspectorInstrumentation::didReceiveResourceResponse(frame(), identifier, documentLoader, response, resource);
|
| // It is essential that inspector gets resource response BEFORE console.
|
| frame()->console().reportResourceResponseReceived(documentLoader, identifier, response);
|
| }
|
| @@ -359,7 +359,7 @@ void FrameFetchContext::dispatchDidFail(unsigned long identifier, const Resource
|
| frame()->console().didFailLoading(identifier, error);
|
| }
|
|
|
| -void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const Resource* resource, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext)
|
| +void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(Resource* resource, WebURLRequest::FrameType frameType, WebURLRequest::RequestContext requestContext)
|
| {
|
| ResourceRequest request(resource->url());
|
| unsigned long identifier = createUniqueIdentifier();
|
| @@ -368,7 +368,7 @@ void FrameFetchContext::dispatchDidLoadResourceFromMemoryCache(const Resource* r
|
|
|
| InspectorInstrumentation::markResourceAsCached(frame(), identifier);
|
| if (!resource->response().isNull())
|
| - dispatchDidReceiveResponse(identifier, resource->response(), frameType, requestContext);
|
| + dispatchDidReceiveResponse(identifier, resource->response(), frameType, requestContext, resource);
|
|
|
| if (resource->encodedSize() > 0)
|
| dispatchDidReceiveData(identifier, 0, resource->encodedSize(), 0);
|
|
|