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)) {

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

This nesting is a bit difficult to reason about, in my opinion. Could we invert
this if() statement and have a line of early-exits? Handle the
!m_fetcher->willFollowRedirect() case, then the
!m_resource->willFollowRedirect(newRequest, redirectResponse), then the changed
url case?

Alternatively, given my comment in DocumentLoader about stopFetching(), maybe
all the non-follow cases should fall through and do a single didFail() and
return false at the end?

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

Nice suggestion. Reorganized.
Done adding didFail() and willNotFollowRedirect() calls. I've changed the order
of URL comparison and Resource::willFollowRedirect() as it's useless to invoke
willFollowRedirect() for fetch for which we've decided not to follow.

I kept the reorganized structure as it's more readable.

-        m_resource->willFollowRedirect(newRequest, redirectResponse);
+        if (m_resource->willFollowRedirect(newRequest, redirectResponse)) {
+            // ResourceFetcher::willFollowRedirect() may rewrite the URL to
+            // something else not for rejecting redirect but for other reasons.
+            // E.g. WebFrameTestClient::willSendRequest() and
+            // RenderFrameImpl::willSendRequest(). We should reflect the
+            // rewriting but currently we cannot. So, return false to make the
+            // redirect fail.
+            return newRequest.url() == originalURL;
+        }
+
+        return false;
     } else {
         m_resource->willNotFollowRedirect();
         if (m_loader)
             didFail(nullptr, ResourceError::cancelledDueToAccessCheckError(newRequest.url()));
+        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