| Index: third_party/WebKit/Source/web/AssociatedURLLoader.cpp
|
| diff --git a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
|
| index fa30afea19cc407ca5e812bd9ba138b0fb571461..b0f913d3bb4b59de0aac879547caafb8607d788d 100644
|
| --- a/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
|
| +++ b/third_party/WebKit/Source/web/AssociatedURLLoader.cpp
|
| @@ -93,8 +93,9 @@ public:
|
| void didFinishLoading(unsigned long /*identifier*/, double /*finishTime*/) override;
|
| void didFail(const ResourceError&) override;
|
| void didFailRedirectCheck() override;
|
| +
|
| // DocumentThreadableLoaderClient
|
| - void willFollowRedirect(ResourceRequest& /*newRequest*/, const ResourceResponse& /*redirectResponse*/) override;
|
| + bool willFollowRedirect(ResourceRequest& /*newRequest*/, const ResourceResponse& /*redirectResponse*/) override;
|
|
|
| // Sets an error to be reported back to the client, asychronously.
|
| void setDelayedError(const ResourceError&);
|
| @@ -143,15 +144,15 @@ AssociatedURLLoader::ClientAdapter::ClientAdapter(AssociatedURLLoader* loader, W
|
| DCHECK(m_client);
|
| }
|
|
|
| -void AssociatedURLLoader::ClientAdapter::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
|
| +bool AssociatedURLLoader::ClientAdapter::willFollowRedirect(ResourceRequest& newRequest, const ResourceResponse& redirectResponse)
|
| {
|
| if (!m_client)
|
| - return;
|
| + return true;
|
|
|
| WrappedResourceRequest wrappedNewRequest(newRequest);
|
| WrappedResourceResponse wrappedRedirectResponse(redirectResponse);
|
| // TODO(ricea): Do we need to set encodedDataLength here?
|
| - m_client->willFollowRedirect(m_loader, wrappedNewRequest, wrappedRedirectResponse, 0);
|
| + return m_client->willFollowRedirect(m_loader, wrappedNewRequest, wrappedRedirectResponse, 0);
|
| }
|
|
|
| void AssociatedURLLoader::ClientAdapter::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
|
|
|