| Index: content/renderer/render_thread_impl.h
|
| diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
|
| index fc6734c82eddfd6054aa0d9b6aee50bb0393674e..e3f46224a8aa2a49ca2c964394e59d21763911a5 100644
|
| --- a/content/renderer/render_thread_impl.h
|
| +++ b/content/renderer/render_thread_impl.h
|
| @@ -179,7 +179,6 @@ class CONTENT_EXPORT RenderThreadImpl
|
| void RemoveObserver(RenderProcessObserver* observer) override;
|
| void SetResourceDispatcherDelegate(
|
| ResourceDispatcherDelegate* delegate) override;
|
| - void EnsureWebKitInitialized() override;
|
| scoped_ptr<base::SharedMemory> HostAllocateSharedMemoryBuffer(
|
| size_t buffer_size) override;
|
| cc::SharedBitmapManager* GetSharedBitmapManager() override;
|
| @@ -457,12 +456,12 @@ class CONTENT_EXPORT RenderThreadImpl
|
| StoragePartitionService* GetStoragePartitionService();
|
|
|
| protected:
|
| - RenderThreadImpl(const InProcessChildThreadParams& params,
|
| - scoped_ptr<scheduler::RendererScheduler> scheduler);
|
| + RenderThreadImpl(
|
| + const InProcessChildThreadParams& params,
|
| + scoped_ptr<scheduler::RendererScheduler> scheduler,
|
| + scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue);
|
| RenderThreadImpl(scoped_ptr<base::MessageLoop> main_message_loop,
|
| scoped_ptr<scheduler::RendererScheduler> scheduler);
|
| - virtual void SetResourceDispatchTaskQueue(
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue);
|
|
|
| private:
|
| // ChildThread
|
| @@ -476,10 +475,13 @@ class CONTENT_EXPORT RenderThreadImpl
|
| scoped_refptr<base::SingleThreadTaskRunner> GetIOThreadTaskRunner() override;
|
| scoped_ptr<base::SharedMemory> AllocateSharedMemory(size_t size) override;
|
|
|
| - void Init();
|
| + void Init(scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue);
|
|
|
| void InitializeCompositorThread();
|
|
|
| + void InitializeWebKit(
|
| + scoped_refptr<base::SingleThreadTaskRunner>& resource_task_queue);
|
| +
|
| void OnCreateNewFrame(FrameMsg_NewFrame_Params params);
|
| void OnCreateNewFrameProxy(int routing_id,
|
| int render_view_routing_id,
|
|
|