Move SwapOut methods to RenderFrameHost.

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/debug/trace_event.h"
@@ skipping 2989 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::SwappedOut(RenderViewHost* rvh) {
-  if (rvh == GetRenderViewHost()) {
+void WebContentsImpl::SwappedOut(RenderFrameHost* rfh) {
+  // TODO(creis): Handle subframes that go fullscreen.
+  if (rfh->GetRenderViewHost() == GetRenderViewHost()) {
     // Exit fullscreen mode before the current RVH is swapped out.  For numerous
     // cases, there is no guarantee the renderer would/could initiate an exit.
     // Example: http://crbug.com/347232
     if (IsFullscreenForCurrentTab()) {
-      if (rvh)
-        rvh->ExitFullscreen();
+      rfh->GetRenderViewHost()->ExitFullscreen();
       DCHECK(!IsFullscreenForCurrentTab());
     }
 
     if (delegate_)
       delegate_->SwappedOut(this);
   }
-
-  // Allow the navigation to proceed.
-  GetRenderManager()->SwappedOut(rvh);

[Charlie Reis, 2014/03/24 22:17:49]

I moved this line into RFHI::SwapOut.

 }
 
 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) {
   if (delegate_ && delegate_->IsPopupOrPanel(this))
     delegate_->MoveContents(this, new_bounds);
 }
 
 void WebContentsImpl::DidStartLoading(RenderFrameHost* render_frame_host) {
   SetIsLoading(render_frame_host->GetRenderViewHost(), true, NULL);
 }
@@ skipping 593 matching lines @@
 
 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
   if (!delegate_)
     return;
   const gfx::Size new_size = GetPreferredSize();
   if (new_size != old_size)
     delegate_->UpdatePreferredSize(this, new_size);
 }
 
 }  // namespace content