Navigation transitions: Block first response until after transitions have run.

content/browser/loader/cross_site_resource_handler.cc

 // Copyright (c) 2012 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/browser/loader/cross_site_resource_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/appcache/appcache_interceptor.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_request_info_impl.h"
+#include "content/browser/transition_request_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/resource_controller.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/resource_response.h"
 #include "content/public/common/url_constants.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
@@ skipping 48 matching lines @@
         params.global_request_id, cross_site_transferring_request.Pass(),
         params.transfer_url_chain, params.referrer,
         params.page_transition, params.should_replace_current_entry);
   } else if (leak_requests_for_testing_ && cross_site_transferring_request) {
     // Some unit tests expect requests to be leaked in this case, so they can
     // pass them along manually.
     cross_site_transferring_request->ReleaseRequest();
   }
 }
 
+void OnDeferredAfterResponseStartedHelper(
+    const GlobalRequestID& global_request_id, int render_frame_id) {

[nasko, 2014/05/28 22:59:00]

style: parameters need to be on line of their own.

[shatch, 2014/05/29 21:41:22]

Done.

+
+  RenderFrameHostImpl* rfh =
+      RenderFrameHostImpl::FromID(global_request_id.child_id,
+                                  render_frame_id);
+  if (rfh) {

[nasko, 2014/05/28 22:59:00]

style: no need for braces here

[shatch, 2014/05/29 21:41:22]

Done.

+    rfh->OnDeferredAfterResponseStarted(global_request_id);
+  }
+}
+
 bool CheckNavigationPolicyOnUI(GURL url, int process_id, int render_frame_id) {
   RenderFrameHostImpl* rfh =
       RenderFrameHostImpl::FromID(process_id, render_frame_id);
   if (!rfh)
     return false;
 
   // TODO(nasko): This check is very simplistic and is used temporarily only
   // for --site-per-process. It should be updated to match the check performed
   // by RenderFrameHostManager::UpdateStateForNavigate.
   return !SiteInstance::IsSameWebSite(
@@ skipping 32 matching lines @@
   // We should not have started the transition before being redirected.
   DCHECK(!in_cross_site_transition_);
   return next_handler_->OnRequestRedirected(
       request_id, new_url, response, defer);
 }
 
 bool CrossSiteResourceHandler::OnResponseStarted(
     int request_id,
     ResourceResponse* response,
     bool* defer) {
+  response_ = response;
+  has_started_response_ = true;
+
+  // Store this handler on the ExtraRequestInfo, so that RDH can call our
+  // ResumeResponse method when we are ready to resume.
+  ResourceRequestInfoImpl* info = GetRequestInfo();
+  info->set_cross_site_handler(this);
+
+  bool is_navigation_transition =
+    TransitionRequestManager::GetInstance()->HasPendingTransitionRequest(
+        info->GetChildID(), info->GetRouteID());
+
+  if (is_navigation_transition)
+    return OnNavigationTransitionResponseStarted(request_id, response, defer);
+  else
+    return OnNormalResponseStarted(request_id, response, defer);
+}
+
+bool CrossSiteResourceHandler::OnNormalResponseStarted(
+    int request_id, ResourceResponse* response, bool* defer) {
   // At this point, we know that the response is safe to send back to the
   // renderer: it is not a download, and it has passed the SSL and safe
   // browsing checks.
   // We should not have already started the transition before now.
   DCHECK(!in_cross_site_transition_);
-  has_started_response_ = true;
 
   ResourceRequestInfoImpl* info = GetRequestInfo();
 
   // We will need to swap processes if either (1) a redirect that requires a
   // transfer occurred before we got here, or (2) a pending cross-site request
   // was already in progress.  Note that a swap may no longer be needed if we
   // transferred back into the original process due to a redirect.
   bool should_transfer =
       GetContentClient()->browser()->ShouldSwapProcessesForRedirect(
           info->GetContext(), request()->original_url(), request()->url());
@@ skipping 38 matching lines @@
   // pause to let the UI thread run the unload handler of the previous page
   // and set up a transfer if needed.
   StartCrossSiteTransition(request_id, response, should_transfer);
 
   // Defer loading until after the onunload event handler has run.
   *defer = true;
   OnDidDefer();
   return true;
 }
 
+bool CrossSiteResourceHandler::OnNavigationTransitionResponseStarted(
+    int request_id, ResourceResponse* response, bool* defer) {
+  ResourceRequestInfoImpl* info = GetRequestInfo();
+  DCHECK_EQ(request_id, info->GetRequestID());
+
+  request()->LogBlockedBy("CrossSiteResourceHandler");
+
+  DCHECK_EQ(request_id, info->GetRequestID());
+  GlobalRequestID global_id(info->GetChildID(), info->GetRequestID());
+  int render_frame_id = info->GetRenderFrameID();
+  BrowserThread::PostTask(
+          BrowserThread::UI,

[nasko, 2014/05/28 22:59:00]

style: wrong indent

[shatch, 2014/05/29 21:41:22]

Done.

+          FROM_HERE,
+          base::Bind(
+              &OnDeferredAfterResponseStartedHelper,
+              global_id, render_frame_id));
+
+  *defer = true;

[nasko, 2014/05/28 22:59:00]

Shouldn't there be a call to OnDidDefer()?

[shatch, 2014/05/29 21:41:22]

Done.

+  return true;
+}
+
+void CrossSiteResourceHandler::ResumeResponseDeferredAtStart(
+    int request_id) {
+  request()->LogUnblocked();
+
+  bool defer;
+  if (!OnNormalResponseStarted(request_id, response_, &defer)) {
+    controller()->Cancel();
+  } else {
+    controller()->Resume();
+  }
+}
+
 void CrossSiteResourceHandler::ResumeOrTransfer(bool is_transfer) {
   if (is_transfer) {
     ResourceRequestInfoImpl* info = GetRequestInfo();
     StartCrossSiteTransition(info->GetRequestID(), response_, is_transfer);
   } else {
     ResumeResponse();
   }
 }
 
 bool CrossSiteResourceHandler::OnReadCompleted(int request_id,
@@ skipping 170 matching lines @@
     controller()->Resume();
   }
 }
 
 void CrossSiteResourceHandler::OnDidDefer() {
   did_defer_ = true;
   request()->LogBlockedBy("CrossSiteResourceHandler");
 }
 
 }  // namespace content