Merge 136168 - Allow renderers to shut down if they only contain swapped out views.

content/browser/renderer_host/render_process_host_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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #if defined(OS_WIN)
@@ skipping 110 matching lines @@
 
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using content::BrowserContext;
 using content::BrowserMessageFilter;
 using content::BrowserThread;
 using content::ChildProcessHost;
 using content::ChildProcessHostImpl;
 using content::RenderWidgetHost;
 using content::RenderWidgetHostImpl;
+using content::RenderViewHost;
+using content::RenderViewHostImpl;
 using content::UserMetricsAction;
 using content::WebUIControllerFactory;
 
 extern bool g_exited_main_message_loop;
 
 // This class creates the IO thread for the renderer when running in
 // single-process mode.  It's not used in multi-process mode.
 class RendererMainThread : public base::Thread {
  public:
   explicit RendererMainThread(const std::string& channel_id)
@@ skipping 1109 matching lines @@
     iter.Advance();
   }
 
   ClearTransportDIBCache();
 
   // this object is not deleted at this point and may be reused later.
   // TODO(darin): clean this up
 }
 
 void RenderProcessHostImpl::OnShutdownRequest() {
-  // Don't shut down if there are more RenderViews than the one asking to
-  // close, or if there are pending RenderViews being swapped back in.
-  if (pending_views_ || render_widget_hosts_.size() > 1)
+  // Don't shut down if there are more active RenderViews than the one asking
+  // to close, or if there are pending RenderViews being swapped back in.
+  int num_active_views = 0;
+  for (RenderWidgetHostsIterator iter = GetRenderWidgetHostsIterator();
+       iter.IsAtEnd();
+       iter.Advance()) {
+    const RenderWidgetHost* widget = iter.GetCurrentValue();
+    DCHECK(widget);
+    if (!widget)
+      continue;
+
+    // All RenderWidgetHosts are swapped in.
+    if (!widget->IsRenderView()) {
+      num_active_views++;
+      continue;
+    }
+
+    // Don't count swapped out views.
+    RenderViewHost* rvh =
+        RenderViewHost::From(const_cast<RenderWidgetHost*>(widget));
+    if (!static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out())
+      num_active_views++;
+  }
+  if (pending_views_ || num_active_views > 1)
     return;
 
   // Notify any contents that might have swapped out renderers from this
   // process. They should not attempt to swap them back in.
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_RENDERER_PROCESS_CLOSING,
       content::Source<RenderProcessHost>(this),
       content::NotificationService::NoDetails());
 
   Send(new ChildProcessMsg_Shutdown());
@@ skipping 83 matching lines @@
 void RenderProcessHostImpl::OnCompositorSurfaceBuffersSwappedNoHost(
       int32 surface_id,
       uint64 surface_handle,
       int32 route_id,
       int32 gpu_process_host_id) {
   TRACE_EVENT0("renderer_host",
                "RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwappedNoHost");
   RenderWidgetHostImpl::AcknowledgeSwapBuffers(route_id,
                                                gpu_process_host_id);
 }