| Index: content/browser/renderer_host/render_process_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
| index 5dd6c0749f4c1c16d6604af6d03cf85d99a99273..d8a6962b2cf2993ebd5df8b94cc9944d6ce3318f 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -583,6 +583,51 @@ class WorkerURLLoaderFactoryProviderImpl
|
| scoped_refptr<ServiceWorkerContextWrapper> service_worker_context_;
|
| };
|
|
|
| +class RenderProcessHostIsReadyObserver : public RenderProcessHostObserver {
|
| + public:
|
| + RenderProcessHostIsReadyObserver(RenderProcessHost* render_process_host,
|
| + base::OnceClosure task)
|
| + : render_process_host_(render_process_host),
|
| + task_(std::move(task)),
|
| + weak_factory_(this) {
|
| + render_process_host_->AddObserver(this);
|
| + if (render_process_host_->IsReady())
|
| + PostTask();
|
| + }
|
| +
|
| + ~RenderProcessHostIsReadyObserver() override {
|
| + render_process_host_->RemoveObserver(this);
|
| + }
|
| +
|
| + void RenderProcessReady(RenderProcessHost* host) override { PostTask(); }
|
| +
|
| + void RenderProcessHostDestroyed(RenderProcessHost* host) override {
|
| + delete this;
|
| + }
|
| +
|
| + private:
|
| + void PostTask() {
|
| + BrowserThread::PostTask(
|
| + BrowserThread::UI, FROM_HERE,
|
| + base::Bind(&RenderProcessHostIsReadyObserver::CallTask,
|
| + weak_factory_.GetWeakPtr()));
|
| + }
|
| +
|
| + void CallTask() {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| + if (render_process_host_->IsReady())
|
| + std::move(task_).Run();
|
| +
|
| + delete this;
|
| + }
|
| +
|
| + RenderProcessHost* render_process_host_;
|
| + base::OnceClosure task_;
|
| + base::WeakPtrFactory<RenderProcessHostIsReadyObserver> weak_factory_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(RenderProcessHostIsReadyObserver);
|
| +};
|
| +
|
| } // namespace
|
|
|
| RendererMainThreadFactoryFunction g_renderer_main_thread_factory = NULL;
|
| @@ -2956,6 +3001,12 @@ size_t RenderProcessHost::GetActiveViewCount() {
|
| return num_active_views;
|
| }
|
|
|
| +void RenderProcessHost::PostTaskWhenProcessIsReady(base::OnceClosure task) {
|
| + DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
| + DCHECK(!task.is_null());
|
| + new RenderProcessHostIsReadyObserver(this, std::move(task));
|
| +}
|
| +
|
| void RenderProcessHostImpl::ReleaseOnCloseACK(
|
| RenderProcessHost* host,
|
| const SessionStorageNamespaceMap& sessions,
|
|
|