Eliminate SwapOut message parameters, keeping state in RVHM instead.

content/browser/web_contents/web_contents_impl.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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 289 matching lines @@
   }
 
  private:
   WebContentsImpl* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(DestructionObserver);
 };
 
 // WebContentsImpl -------------------------------------------------------------
 
+WebContentsImpl::PendingNavigationParams::PendingNavigationParams() {
+}
+
+WebContentsImpl::PendingNavigationParams::PendingNavigationParams(
+    const GlobalRequestID& global_request_id)
+    : global_request_id(global_request_id) {
+}
+
 WebContentsImpl::WebContentsImpl(
     BrowserContext* browser_context,
     WebContentsImpl* opener)
     : delegate_(NULL),
       controller_(this, browser_context),
       render_view_host_delegate_view_(NULL),
       opener_(opener),
 #if defined(OS_WIN) && defined(USE_AURA)
       accessible_parent_(NULL),
 #endif
@@ skipping 2706 matching lines @@
     view_->CloseTabAfterEventTracking();
     return;
   }
 #endif
 
   // Ignore this if it comes from a RenderViewHost that we aren't showing.
   if (delegate_ && rvh == GetRenderViewHost())
     delegate_->CloseContents(this);
 }
 
+void WebContentsImpl::OnCrossSiteResponse(
+    RenderViewHost* pending_render_view_host,
+    const GlobalRequestID& global_request_id) {
+  // This should be called when the pending RVH is ready to commit.
+  DCHECK_EQ(pending_render_view_host,
+            render_manager_.pending_render_view_host());
+
+  // Remember the request ID until the unload handler has run.
+  pending_nav_params_.reset(new PendingNavigationParams(global_request_id));
+
+  // Run the unload handler of the current page.
+  render_manager_.SwapOutOldPage();
+}
+
 void WebContentsImpl::SwappedOut(RenderViewHost* rvh) {
-  if (delegate_ && rvh == GetRenderViewHost())
+  if (rvh != GetRenderViewHost()) {
+    pending_nav_params_.reset();
+    return;
+  }
+
+  if (delegate_)
     delegate_->SwappedOut(this);
+
+  // Make sure we have a pending navigation from OnCrossSiteResponse above.
+  // If not (e.g., for data URLs that don't make network requests), just return
+  // early and ignore.
+  if (!pending_nav_params_.get())
+    return;
+
+  // Now that the unload handler has run, we need to resume the paused response.
+  if (render_manager_.pending_render_view_host()) {
+    RenderProcessHostImpl* pending_process =
+        static_cast<RenderProcessHostImpl*>(
+            render_manager_.pending_render_view_host()->GetProcess());
+    pending_process->ResumeDeferredNavigation(
+        pending_nav_params_->global_request_id);
+  }
+  pending_nav_params_.reset();
 }
 
 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) {
   if (delegate_ && delegate_->IsPopupOrPanel(this))
     delegate_->MoveContents(this, new_bounds);
 }
 
 void WebContentsImpl::DidStartLoading(RenderViewHost* render_view_host) {
   SetIsLoading(true, NULL);
 
@@ skipping 579 matching lines @@
 }
 
 BrowserPluginGuestManager*
     WebContentsImpl::GetBrowserPluginGuestManager() const {
   return static_cast<BrowserPluginGuestManager*>(
       GetBrowserContext()->GetUserData(
           browser_plugin::kBrowserPluginGuestManagerKeyName));
 }
 
 }  // namespace content