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

content/browser/frame_host/render_frame_host_manager.h

Index: content/browser/frame_host/render_frame_host_manager.h
diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index d71845e3c10137c61963482c4cbfe83a6b7b0330..4bbed5aaf6377b0f9cdce667295d37be47cb11a3 100644
--- a/content/browser/frame_host/render_frame_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -218,10 +218,22 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
       PageTransition page_transition,
       bool should_replace_current_entry);
 
+  // Recieved a response from cross site resource handler. If

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

nit: CrossSiteResourceHandler
Also, single "If" looks like missing the rest of the comment.

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

Done.

+  void OnDeferredAfterResponseStarted(
+      const GlobalRequestID& global_request_id,
+      RenderFrameHostImpl* pending_render_frame_host);
+
+  // Sets whether or not the navigation should pause on first response.
+  void SetHasPendingTransitionRequest(
+      bool has_pending_transition);
+
   // The RenderFrameHost has been swapped out, so we should resume the pending
   // network response and allow the pending RenderFrameHost to commit.
   void SwappedOut(RenderFrameHostImpl* render_frame_host);
 
+  // Resume navigation paused after receiving response headers.
+  void ResumeResponseDeferredAtStart();

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

nit: Move this definition up, so it is grouped together with other calls coming
from the IO thread.

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

Done.

+
   // Called when a renderer's frame navigates.
   void DidNavigateFrame(RenderFrameHostImpl* render_frame_host);
 
@@ -330,6 +342,18 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
     bool should_replace_current_entry;
   };
 
+  // Tracks information about a navigation that's been paused after
+  // first response.
+  struct ResponseStartedParams {

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

Do we really need a struct just to wrap a single struct?

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

Changed the response_started_params_ to a scoped_ptr to the request id.

+    ResponseStartedParams(
+        const GlobalRequestID& global_request_id);
+    ~ResponseStartedParams();
+
+    // The child ID and request ID for the pending navigation.  Present whether
+    // |request_transfer| is NULL or not.
+    GlobalRequestID global_request_id;
+  };
+
   // Used with FrameTree::ForEach to erase RenderFrameProxyHosts from a
   // FrameTreeNode's RenderFrameHostManager.
   static bool ClearProxiesInSiteInstance(int32 site_instance_id,
@@ -449,6 +473,10 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
   // Tracks information about any current pending cross-process navigation.
   scoped_ptr<PendingNavigationParams> pending_nav_params_;
 
+  // Tracks information about any navigation paused after receiving response
+  // headers.
+  scoped_ptr<ResponseStartedParams> response_started_params_;
+
   // If either of these is non-NULL, the pending navigation is to a chrome:
   // page. The scoped_ptr is used if pending_web_ui_ != web_ui_, the WeakPtr is
   // used for when they reference the same object. If either is non-NULL, the