Separate RenderViewHost from RenderWidgetHost, part 10: shutdown.

content/browser/frame_host/frame_tree.cc

 // 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.
 
 #include "content/browser/frame_host/frame_tree.h"
 
 #include <queue>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 337 matching lines @@
   SiteInstance* site_instance = render_view_host->GetSiteInstance();
   int32 site_instance_id = site_instance->GetId();
   RenderViewHostMap::iterator iter =
       render_view_host_map_.find(site_instance_id);
   if (iter != render_view_host_map_.end() && iter->second == render_view_host) {
     // Decrement the refcount and shutdown the RenderViewHost if no one else is
     // using it.
     CHECK_GT(iter->second->ref_count(), 0);
     iter->second->decrement_ref_count();
     if (iter->second->ref_count() == 0) {
-      iter->second->Shutdown();
+      iter->second->ShutdownAndDestroy();
       render_view_host_map_.erase(iter);
     }
   } else {
     // The RenderViewHost should be in the list of RenderViewHosts pending
     // shutdown.
     bool render_view_host_found = false;
     std::pair<RenderViewHostMultiMap::iterator,
               RenderViewHostMultiMap::iterator> result =
         render_view_host_pending_shutdown_map_.equal_range(site_instance_id);
     for (RenderViewHostMultiMap::iterator multi_iter = result.first;
          multi_iter != result.second;
          ++multi_iter) {
       if (multi_iter->second != render_view_host)
         continue;
       render_view_host_found = true;
       // Decrement the refcount and shutdown the RenderViewHost if no one else
       // is using it.
       CHECK_GT(render_view_host->ref_count(), 0);
       render_view_host->decrement_ref_count();
       if (render_view_host->ref_count() == 0) {
-        render_view_host->Shutdown();
+        render_view_host->ShutdownAndDestroy();
         render_view_host_pending_shutdown_map_.erase(multi_iter);
       }
       break;
     }
     CHECK(render_view_host_found);
   }
 }
 
 void FrameTree::FrameRemoved(FrameTreeNode* frame) {
   if (frame->frame_tree_node_id() == focused_frame_tree_node_id_)
@@ skipping 56 matching lines @@
   // This is only used to set page-level focus in cross-process subframes, and
   // requests to set focus in main frame's SiteInstance are ignored.
   if (instance != root_manager->current_frame_host()->GetSiteInstance()) {
     RenderFrameProxyHost* proxy =
         root_manager->GetRenderFrameProxyHost(instance);
     proxy->Send(new InputMsg_SetFocus(proxy->GetRoutingID(), is_focused));
   }
 }
 
 }  // namespace content