Index: content/browser/renderer_host/render_process_host_impl.h |
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h |
index 96e664d759ddfc18147963e11f0da001cd67b3e8..59298cdea0cafcab1e54c66ca262a4b8ec589cf9 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.h |
+++ b/content/browser/renderer_host/render_process_host_impl.h |
@@ -114,9 +114,20 @@ class CONTENT_EXPORT RenderProcessHostImpl |
public NON_EXPORTED_BASE(mojom::AssociatedInterfaceProvider), |
public NON_EXPORTED_BASE(mojom::RendererHost) { |
public: |
- RenderProcessHostImpl(BrowserContext* browser_context, |
- StoragePartitionImpl* storage_partition_impl, |
- bool is_for_guests_only); |
+ // Use the spare RenderProcessHost if it exists, or create a new one. This |
+ // should be the usual way to get a new RenderProcessHost. |
+ static RenderProcessHost* CreateOrUseSpareRenderProcessHost( |
+ BrowserContext* browser_context, |
+ StoragePartitionImpl* storage_partition_impl, |
+ bool is_for_guests_only); |
+ |
+ // Create a new RenderProcessHost. In most cases |
+ // CreateOrUseSpareRenderProcessHost, above, should be used instead. |
+ static RenderProcessHost* CreateRenderProcessHost( |
+ BrowserContext* browser_context, |
+ StoragePartitionImpl* storage_partition_impl, |
+ bool is_for_guests_only); |
+ |
~RenderProcessHostImpl() override; |
// RenderProcessHost implementation (public portion). |
@@ -337,6 +348,10 @@ class CONTENT_EXPORT RenderProcessHostImpl |
RenderProcessHost* render_process_host, |
const GURL& site_url); |
+ // Return the spare RenderProcessHost, if it exists. There is at most one |
+ // globally-used spare RenderProcessHost at any time. |
+ static RenderProcessHost* GetSpareRenderProcessHostForTesting(); |
+ |
protected: |
// A proxy for our IPC::Channel that lives on the IO thread. |
std::unique_ptr<IPC::ChannelProxy> channel_; |
@@ -363,6 +378,12 @@ class CONTENT_EXPORT RenderProcessHostImpl |
class ConnectionFilterController; |
class ConnectionFilterImpl; |
+ // Use CreateRenderProcessHost() instead of calling this constructor |
+ // directly. |
+ RenderProcessHostImpl(BrowserContext* browser_context, |
+ StoragePartitionImpl* storage_partition_impl, |
+ bool is_for_guests_only); |
+ |
// Initializes a new IPC::ChannelProxy in |channel_|, which will be connected |
// to the next child process launched for this host, if any. |
void InitializeChannelProxy(); |