Eliminate SwapOut message parameters, keeping state in RVHM instead.

content/browser/web_contents/render_view_host_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 148 matching lines @@
   // Notifies the regular and pending RenderViewHosts that a load is or is not
   // happening. Even though the message is only for one of them, we don't know
   // which one so we tell both.
   void SetIsLoading(bool is_loading);
 
   // Whether to close the tab or not when there is a hang during an unload
   // handler. If we are mid-crosssite navigation, then we should proceed
   // with the navigation instead of closing the tab.
   bool ShouldCloseTabOnUnresponsiveRenderer();
 
+  // The RenderViewHost has been swapped out, so we should resume the pending
+  // network response and allow the pending RenderViewHost to commit.
+  void SwappedOut(RenderViewHost* render_view_host);
+
   // Called when a renderer's main frame navigates.
   void DidNavigateMainFrame(RenderViewHost* render_view_host);
 
   // Called when a renderer sets its opener to null.
   void DidDisownOpener(RenderViewHost* render_view_host);
 
   // Helper method to create a RenderViewHost.  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 CreateRenderView(SiteInstance* instance,
@@ skipping 20 matching lines @@
 
   // Returns the currently showing interstitial, NULL if no interstitial is
   // showing.
   InterstitialPageImpl* interstitial_page() const { return interstitial_page_; }
 
   // RenderViewHostDelegate::RendererManagement implementation.
   virtual void ShouldClosePage(
       bool for_cross_site_transition,
       bool proceed,
       const base::TimeTicks& proceed_time) OVERRIDE;
-  virtual void OnCrossSiteResponse(int new_render_process_host_id,
-                                   int new_request_id) OVERRIDE;
+  virtual void OnCrossSiteResponse(

[nasko, 2013/06/06 15:41:50]

nit: Missing empty line between the two methods.

[Charlie Reis, 2013/06/06 16:33:09]

This is consistent with other places that we implement multiple methods from an
interface.  For example, see the "RenderViewHostDelegate" section of
web_contents_impl.h.

+      RenderViewHost* pending_render_view_host,
+      const GlobalRequestID& global_request_id) OVERRIDE;
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
   // Called when a RenderViewHost is about to be deleted.
   void RenderViewDeleted(RenderViewHost* rvh);
 
   // Returns whether the given RenderViewHost is on the list of swapped out
   // RenderViewHosts.
   bool IsOnSwappedOutList(RenderViewHost* rvh) const;
 
   // Returns the swapped out RenderViewHost for the given SiteInstance, if any.
   RenderViewHostImpl* GetSwappedOutRenderViewHost(SiteInstance* instance);
 
+  // Runs the unload handler in the current page, when we know that a pending
+  // cross-process navigation is going to commit.
+  void SwapOutOldPage();
+
  private:
   friend class RenderViewHostManagerTest;
   friend class TestWebContents;
 
+  // Tracks information about a navigation while a cross-process transition is
+  // in progress.
+  // TODO(creis): Add transfer navigation params for http://crbug.com/238331.
+  struct PendingNavigationParams {
+    PendingNavigationParams();
+    explicit PendingNavigationParams(const GlobalRequestID& global_request_id);
+
+    GlobalRequestID global_request_id;
+  };
+
   // 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();
 
   // Returns true if the two navigation entries are incompatible in some way
   // other than site instances. Cases where this can happen include Web UI
   // to regular web pages. It will cause us to swap RenderViewHosts (and hence
   // RenderProcessHosts) even if the site instance would otherwise be the same.
   // As part of this, we'll also force new SiteInstances and BrowsingInstances.
@@ skipping 55 matching lines @@
   // have an associated Web UI, in which case the Web UI pointer will be non-
   // NULL.
   //
   // The |pending_web_ui_| may be non-NULL even when the
   // |pending_render_view_host_| is NULL. This will happen when we're
   // transitioning between two Web UI pages: the RVH won't be swapped, so the
   // pending pointer will be unused, but there will be a pending Web UI
   // associated with the navigation.
   RenderViewHostImpl* pending_render_view_host_;
 
+  // Tracks information about any current pending cross-process navigation.
+  scoped_ptr<PendingNavigationParams> pending_nav_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 swapped out RenderViewHosts.  This may include
   // pending_render_view_host_ for navigations to existing entries.
   typedef base::hash_map<int32, RenderViewHostImpl*> RenderViewHostMap;
   RenderViewHostMap swapped_out_hosts_;
 
   // The intersitial page currently shown if any, not own by this class
   // (the InterstitialPage is self-owned, it deletes itself when hidden).
   InterstitialPageImpl* interstitial_page_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_