| Index: ui/compositor/test/in_process_context_provider.h
|
| diff --git a/ui/compositor/test/in_process_context_provider.h b/ui/compositor/test/in_process_context_provider.h
|
| index b7c85652fe13938ab5c13a588c9ef3fd5392eca2..5e0447c56acc03fde3a6e4b20e271a1a87f93c3f 100644
|
| --- a/ui/compositor/test/in_process_context_provider.h
|
| +++ b/ui/compositor/test/in_process_context_provider.h
|
| @@ -30,6 +30,7 @@ class InProcessContextProvider : public cc::ContextProvider {
|
| public:
|
| static scoped_refptr<InProcessContextProvider> Create(
|
| const gpu::gles2::ContextCreationAttribHelper& attribs,
|
| + InProcessContextProvider* shared_context,
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| gpu::ImageFactory* image_factory,
|
| gfx::AcceleratedWidget window,
|
| @@ -38,7 +39,8 @@ class InProcessContextProvider : public cc::ContextProvider {
|
| // Uses default attributes for creating an offscreen context.
|
| static scoped_refptr<InProcessContextProvider> CreateOffscreen(
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| - gpu::ImageFactory* image_factory);
|
| + gpu::ImageFactory* image_factory,
|
| + InProcessContextProvider* shared_context);
|
|
|
| // cc::ContextProvider:
|
| bool BindToCurrentThread() override;
|
| @@ -57,14 +59,13 @@ class InProcessContextProvider : public cc::ContextProvider {
|
| private:
|
| InProcessContextProvider(
|
| const gpu::gles2::ContextCreationAttribHelper& attribs,
|
| + InProcessContextProvider* shared_context,
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
|
| gpu::ImageFactory* image_factory,
|
| gfx::AcceleratedWidget window,
|
| const std::string& debug_name);
|
| ~InProcessContextProvider() override;
|
|
|
| - void OnLostContext();
|
| -
|
| base::ThreadChecker main_thread_checker_;
|
| base::ThreadChecker context_thread_checker_;
|
|
|
| @@ -72,14 +73,13 @@ class InProcessContextProvider : public cc::ContextProvider {
|
| skia::RefPtr<class GrContext> gr_context_;
|
|
|
| gpu::gles2::ContextCreationAttribHelper attribs_;
|
| + InProcessContextProvider* shared_context_;
|
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
|
| gpu::ImageFactory* image_factory_;
|
| gfx::AcceleratedWidget window_;
|
| std::string debug_name_;
|
| cc::ContextProvider::Capabilities capabilities_;
|
|
|
| - LostContextCallback lost_context_callback_;
|
| -
|
| base::Lock context_lock_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InProcessContextProvider);
|
|
|