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

content/browser/frame_host/render_frame_host_manager.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 200 matching lines @@
   // transferred between renderers.
   void OnCrossSiteResponse(
       RenderFrameHostImpl* pending_render_frame_host,
       const GlobalRequestID& global_request_id,
       scoped_ptr<CrossSiteTransferringRequest> cross_site_transferring_request,
       const std::vector<GURL>& transfer_url_chain,
       const Referrer& referrer,
       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);
 
   // Called when a renderer sets its opener to null.
   void DidDisownOpener(RenderViewHost* render_view_host);
 
   // Helper method to create and initialize a RenderFrameHost.  If |swapped_out|
   // is true, it will be initially placed on the swapped out hosts list.
   // Otherwise, it will be used for a pending cross-site navigation.
   int CreateRenderFrame(SiteInstance* instance,
@@ skipping 88 matching lines @@
     // This is the transition type for the original navigation.
     PageTransition page_transition;
 
     // This is the frame routing ID to use in RequestTransferURL.
     int render_frame_id;
 
     // This is whether the navigation should replace the current history entry.
     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,
                                          FrameTreeNode* node);
 
   // Returns whether this tab should transition to a new renderer for
   // cross-site URLs.  Enabled unless we see the --process-per-tab command line
   // switch.  Can be overridden in unit tests.
   bool ShouldTransitionCrossSite();
 
@@ skipping 99 matching lines @@
   // The |pending_web_ui_| may be non-NULL even when the
   // |pending_render_frame_host_| is NULL. This will happen when we're
   // transitioning between two Web UI pages: the RFH won't be swapped, so the
   // pending pointer will be unused, but there will be a pending Web UI
   // associated with the navigation.
   scoped_ptr<RenderFrameHostImpl> pending_render_frame_host_;
 
   // 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
   // other should be NULL.
   scoped_ptr<WebUIImpl> pending_web_ui_;
   base::WeakPtr<WebUIImpl> pending_and_current_web_ui_;
 
   // A map of site instance ID to RenderFrameProxyHosts.
   typedef base::hash_map<int32, RenderFrameProxyHost*> RenderFrameProxyHostMap;
   RenderFrameProxyHostMap proxy_hosts_;
@@ skipping 17 matching lines @@
   CrossProcessFrameConnector* cross_process_frame_connector_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_