Change WebURLLoaderClient::willFollowRedirect() API to return bool

third_party/WebKit/Source/core/fetch/ResourceLoader.cpp

 /*
  * Copyright (C) 2006, 2007, 2010, 2011 Apple Inc. All rights reserved.
  *           (C) 2007 Graham Dennis (graham.dennis@gmail.com)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 105 matching lines @@
 {
     if (m_loader)
         m_loader->didChangePriority(static_cast<WebURLRequest::Priority>(loadPriority), intraPriorityValue);
 }
 
 void ResourceLoader::cancel()
 {
     didFail(nullptr, ResourceError::cancelledError(m_resource->lastResourceRequest().url()));
 }
 
-void ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse, int64_t encodedDataLength)
+bool ResourceLoader::willFollowRedirect(WebURLLoader*, WebURLRequest& passedNewRequest, const WebURLResponse& passedRedirectResponse, int64_t encodedDataLength)
 {
     ASSERT(!passedNewRequest.isNull());
     ASSERT(!passedRedirectResponse.isNull());
 
     ResourceRequest& newRequest(passedNewRequest.toMutableResourceRequest());
     const ResourceResponse& redirectResponse(passedRedirectResponse.toResourceResponse());
     newRequest.setRedirectStatus(ResourceRequest::RedirectStatus::FollowedRedirect);
 
+    const KURL originalURL = newRequest.url();
     if (m_fetcher->willFollowRedirect(m_resource.get(), newRequest, redirectResponse, encodedDataLength)) {
-        m_resource->willFollowRedirect(newRequest, redirectResponse);
+        if (m_resource->willFollowRedirect(newRequest, redirectResponse))
+            return newRequest.url() == originalURL;

[Nate Chapin, 2016/09/06 16:46:14]

I assume this is handling some old cases that still try to cancel the request by
blanking the url? Can we hunt those down and get rid of them?

[tyoshino (SeeGerritForStatus), 2016/09/07 10:52:28]

Inside m_fetcher->willFollowRedirect(), we may reach
WebFrameTestClient::willSendRequest() and RenderFrameImpl::willSendRequest()
which may rewrite the URL. Yeah, this line is to capture them.

They're about extension URLs and layout test output directories.

Maybe the right thing to do is to honor these rewrites but currently it doesn't
get reflected to net stack. It looks the best thing we can do here is not to
follow redirect.

+
+        return false;
     } else {
         m_resource->willNotFollowRedirect();
         if (m_loader)
             didFail(nullptr, ResourceError::cancelledDueToAccessCheckError(newRequest.url()));

[Nate Chapin, 2016/09/06 16:46:14]

Is the didFail() still needed?

[tyoshino (SeeGerritForStatus), 2016/09/07 10:52:28]

Hmm, ResourceDispatcher::Cancel() will be invoked to clear the corresponding
PendingRequest. But that's it. It's only a part of what happens on
m_loader.reset(). So, we should keep this?

Is there any other path to do what's done in didFail()?

[Nate Chapin, 2016/09/07 17:05:45]

No. I guess ResourceDispatcher::Cancel() could trigger the didFail(), but that's
a bigger, less predictable change, so leaving the didFail() here is fine.

[tyoshino (SeeGerritForStatus), 2016/09/14 14:53:47]

OK. I'll try to do it later when I get chance.

+        return false;
     }
 }
 
 void ResourceLoader::didReceiveCachedMetadata(WebURLLoader*, const char* data, int length)
 {
     m_resource->setSerializedCachedMetadata(data, length);
 }
 
 void ResourceLoader::didSendData(WebURLLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
 {
@@ skipping 69 matching lines @@
     // empty buffer is a noop in most cases, but is destructive in the case of
     // a 304, where it will overwrite the cached data we should be reusing.
     if (dataOut.size()) {
         m_fetcher->didReceiveData(m_resource.get(), dataOut.data(), dataOut.size(), encodedDataLength);
         m_resource->setResourceBuffer(dataOut);
     }
     didFinishLoading(0, monotonicallyIncreasingTime(), encodedDataLength);
 }
 
 } // namespace blink