Change WebURLLoaderClient::willFollowRedirect() API to return bool

third_party/WebKit/Source/core/loader/PingLoader.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 186 matching lines @@
                  StoredCredentials,
                  bool);
   ~PingLoaderImpl() override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   void dispose();
 
   // WebURLLoaderClient
-  void willFollowRedirect(WebURLLoader*,
+  bool willFollowRedirect(WebURLLoader*,
                           WebURLRequest&,
                           const WebURLResponse&) override;
   void didReceiveResponse(WebURLLoader*, const WebURLResponse&) final;
   void didReceiveData(WebURLLoader*, const char*, int, int, int) final;
   void didFinishLoading(WebURLLoader*, double, int64_t) final;
   void didFail(WebURLLoader*, const WebURLError&) final;
 
   void timeout(TimerBase*);
 
   void didFailLoading(LocalFrame*);
@@ skipping 63 matching lines @@
 
 void PingLoaderImpl::dispose() {
   if (m_loader) {
     m_loader->cancel();
     m_loader = nullptr;
   }
   m_timeout.stop();
   m_keepAlive.clear();
 }
 
-void PingLoaderImpl::willFollowRedirect(
+bool PingLoaderImpl::willFollowRedirect(
     WebURLLoader*,
     WebURLRequest& passedNewRequest,
     const WebURLResponse& passedRedirectResponse) {
   if (!m_isBeacon)
-    return;
+    return true;
 
   // TODO(tyoshino): Check if setAllowStoredCredentials() should be called also
   // for non beacon cases.
   passedNewRequest.setAllowStoredCredentials(true);
   if (m_corsMode == NotCORSEnabled)
-    return;
+    return true;
 
   ResourceRequest& newRequest(passedNewRequest.toMutableResourceRequest());
   const ResourceResponse& redirectResponse(
       passedRedirectResponse.toResourceResponse());
 
   DCHECK(!newRequest.isNull());
   DCHECK(!redirectResponse.isNull());
 
   String errorDescription;
   ResourceLoaderOptions options;
   // TODO(tyoshino): Save updated data in options.securityOrigin and pass it
   // on the next time.
   if (!CrossOriginAccessControl::handleRedirect(
           m_origin, newRequest, redirectResponse, AllowStoredCredentials,
           options, errorDescription)) {
     if (LocalFrame* localFrame = frame()) {
       if (localFrame->document())
         localFrame->document()->addConsoleMessage(ConsoleMessage::create(
             JSMessageSource, ErrorMessageLevel, errorDescription));
     }
     // Cancel the load and self destruct.
     dispose();
-    // Signal WebURLLoader that the redirect musn't be followed.
-    passedNewRequest = WebURLRequest();
-    return;
+
+    return false;
   }
   // FIXME: http://crbug.com/427429 is needed to correctly propagate updates of
   // Origin: following this successful redirect.
+
+  return true;
 }
 
 void PingLoaderImpl::didReceiveResponse(WebURLLoader*,
                                         const WebURLResponse& response) {
   if (LocalFrame* frame = this->frame()) {
     TRACE_EVENT_INSTANT1(
         "devtools.timeline", "ResourceFinish", TRACE_EVENT_SCOPE_THREAD, "data",
         InspectorResourceFinishEvent::data(m_identifier, 0, true));
     const ResourceResponse& resourceResponse = response.toResourceResponse();
     InspectorInstrumentation::didReceiveResourceResponse(frame, m_identifier, 0,
@@ skipping 209 matching lines @@
 bool PingLoader::sendBeacon(LocalFrame* frame,
                             int allowance,
                             const KURL& beaconURL,
                             Blob* data,
                             int& payloadLength) {
   BeaconBlob beacon(data);
   return sendBeaconCommon(frame, allowance, beaconURL, beacon, payloadLength);
 }
 
 }  // namespace blink