PlzNavigate: transmit redirect info to the renderer side

content/child/web_url_loader_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/web_url_loader_impl.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 697 matching lines @@
   // PlzNavigate: during navigations, the ResourceResponse has already been
   // received on the browser side, and has been passed down to the renderer.
   if (stream_override_.get()) {
     CHECK(IsBrowserSideNavigationEnabled());
     // Compute the delta between the response sizes so that the accurate
     // transfer size can be reported at the end of the request.
     stream_override_->total_transfer_size_delta =
         stream_override_->response.encoded_data_length -
         initial_info.encoded_data_length;
     info = stream_override_->response;
+
+    // Replay the redirects that happened during navigation.
+    DCHECK_EQ(stream_override_->redirect_responses.size(),
+              stream_override_->redirect_infos.size());
+    for (size_t i = 0; i < stream_override_->redirect_responses.size(); ++i) {
+      bool result = OnReceivedRedirect(stream_override_->redirect_infos[i],
+                                       stream_override_->redirect_responses[i]);
+      if (!result) {
+        NOTREACHED();
+        return;
+      }
+    }
   }
 
   WebURLResponse response;
   GURL url(request_.url());
   PopulateURLResponse(url, info, &response, request_.reportRawHeaders());
 
-  if (stream_override_.get()) {
-    CHECK(IsBrowserSideNavigationEnabled());
-    DCHECK(stream_override_->redirect_responses.size() ==
-           stream_override_->redirects.size());
-    for (size_t i = 0; i < stream_override_->redirects.size(); ++i) {
-      WebURLResponse previous_response;
-      // TODO(arthursonzogni) Once Devtool is supported by PlzNavigate, the
-      // |report_raw_header| argument must be checked.
-      WebURLLoaderImpl::PopulateURLResponse(
-          stream_override_->redirects[i],
-          stream_override_->redirect_responses[i],
-          &previous_response,
-          request_.reportRawHeaders());
-      response.appendRedirectResponse(previous_response);
-    }
-  }

[nasko, 2017/02/10 23:53:09]

Just to make sure I understand, the reason we don't need this block anymore is
the new replaying of receiving redirects will properly populate the response
object?

[clamy, 2017/02/13 14:29:37]

Precisely.

-
   bool show_raw_listing = false;
   if (info.mime_type == "text/vnd.chromium.ftp-dir") {
     if (url.query_piece() == "raw") {
       // Set the MIME type to plain text to prevent any active content.
       response.setMIMEType("text/plain");
       show_raw_listing = true;
     } else {
       // We're going to produce a parsed listing in HTML.
       response.setMIMEType("text/html");
     }
@@ skipping 446 matching lines @@
 
   new_request.setHTTPReferrer(WebString::fromUTF8(redirect_info.new_referrer),
                                NetReferrerPolicyToBlinkReferrerPolicy(
                                    redirect_info.new_referrer_policy));
   new_request.setPriority(request.getPriority());
 
   std::string old_method = request.httpMethod().utf8();
   new_request.setHTTPMethod(WebString::fromUTF8(redirect_info.new_method));
   if (redirect_info.new_method == old_method)
     new_request.setHTTPBody(request.httpBody());
+
+  new_request.setCheckForBrowserSideNavigation(
+      request.checkForBrowserSideNavigation());
+
   return new_request;
 }
 
 void WebURLLoaderImpl::loadSynchronously(const WebURLRequest& request,
                                          WebURLResponse& response,
                                          WebURLError& error,
                                          WebData& data,
                                          int64_t& encoded_data_length,
                                          int64_t& encoded_body_length) {
   TRACE_EVENT0("loading", "WebURLLoaderImpl::loadSynchronously");
@@ skipping 44 matching lines @@
                                          int intra_priority_value) {
   context_->DidChangePriority(new_priority, intra_priority_value);
 }
 
 void WebURLLoaderImpl::setLoadingTaskRunner(
     base::SingleThreadTaskRunner* loading_task_runner) {
   context_->SetTaskRunner(loading_task_runner);
 }
 
 }  // namespace content