| Index: Source/core/loader/DocumentThreadableLoader.cpp
|
| diff --git a/Source/core/loader/DocumentThreadableLoader.cpp b/Source/core/loader/DocumentThreadableLoader.cpp
|
| index 6dc14867ff3a32a942e9fcc8859457ff5114dd3d..97bf370f3c5b39a31cc871ede83da56afdda27dd 100644
|
| --- a/Source/core/loader/DocumentThreadableLoader.cpp
|
| +++ b/Source/core/loader/DocumentThreadableLoader.cpp
|
| @@ -209,7 +209,7 @@ void DocumentThreadableLoader::redirectReceived(Resource* resource, ResourceRequ
|
| // original request was not same-origin.
|
| if (m_options.crossOriginRequestPolicy == UseAccessControl) {
|
|
|
| - InspectorInstrumentation::didReceiveCORSRedirectResponse(m_document->frame(), resource->identifier(), m_document->frame()->loader()->documentLoader(), redirectResponse, 0);
|
| + InspectorInstrumentation::didReceiveCORSRedirectResponse(m_document->frame(), resource->identifier(), m_document->frame()->loader().documentLoader(), redirectResponse, 0);
|
|
|
| bool allowRedirect = false;
|
| String accessControlErrorDescription;
|
| @@ -286,7 +286,7 @@ void DocumentThreadableLoader::didReceiveResponse(unsigned long identifier, cons
|
|
|
| String accessControlErrorDescription;
|
| if (m_actualRequest) {
|
| - DocumentLoader* loader = m_document->frame()->loader()->documentLoader();
|
| + DocumentLoader* loader = m_document->frame()->loader().documentLoader();
|
| InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_document->frame(), identifier, response);
|
| InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, response, m_resource ? m_resource->loader() : 0);
|
|
|
| @@ -356,7 +356,7 @@ void DocumentThreadableLoader::notifyFinished(Resource* resource)
|
| void DocumentThreadableLoader::didFinishLoading(unsigned long identifier, double finishTime)
|
| {
|
| if (m_actualRequest) {
|
| - InspectorInstrumentation::didFinishLoading(m_document->frame(), identifier, m_document->frame()->loader()->documentLoader(), finishTime);
|
| + InspectorInstrumentation::didFinishLoading(m_document->frame(), identifier, m_document->frame()->loader().documentLoader(), finishTime);
|
| ASSERT(!m_sameOriginRequest);
|
| ASSERT(m_options.crossOriginRequestPolicy == UseAccessControl);
|
| preflightSuccess();
|
| @@ -367,7 +367,7 @@ void DocumentThreadableLoader::didFinishLoading(unsigned long identifier, double
|
| void DocumentThreadableLoader::didFail(unsigned long identifier, const ResourceError& error)
|
| {
|
| if (m_actualRequest)
|
| - InspectorInstrumentation::didFailLoading(m_document->frame(), identifier, m_document->frame()->loader()->documentLoader(), error);
|
| + InspectorInstrumentation::didFailLoading(m_document->frame(), identifier, m_document->frame()->loader().documentLoader(), error);
|
|
|
| m_client->didFail(error);
|
| }
|
| @@ -401,7 +401,7 @@ void DocumentThreadableLoader::preflightFailure(unsigned long identifier, const
|
| {
|
| ResourceError error(errorDomainWebKitInternal, 0, url, errorDescription);
|
| if (m_actualRequest)
|
| - InspectorInstrumentation::didFailLoading(m_document->frame(), identifier, m_document->frame()->loader()->documentLoader(), error);
|
| + InspectorInstrumentation::didFailLoading(m_document->frame(), identifier, m_document->frame()->loader().documentLoader(), error);
|
| m_actualRequest = nullptr; // Prevent didFinishLoading() from bypassing access check.
|
| m_client->didFailAccessControlCheck(error);
|
| }
|
|
|