| Index: content/browser/android/in_process/synchronous_compositor_factory_impl.h
|
| diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.h b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
|
| index 2ae75e57a4db6dca9b1574ddbd01c3bf5208b5ec..ac0648f817bfcad5b62470203c5a629fa8e4bcfd 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h
|
| +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
|
| @@ -66,13 +66,15 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
|
| bool CanCreateMainThreadContext();
|
| scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
|
| TryCreateStreamTextureFactory();
|
| + void RestoreContextOnMainThread();
|
|
|
| SynchronousInputEventFilter synchronous_input_event_filter_;
|
|
|
| scoped_refptr<gpu::InProcessCommandBuffer::Service> service_;
|
| scoped_ptr<gpu::GLInProcessContext> share_context_;
|
| - scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
|
| - video_context_provider_;
|
| +
|
| + class VideoContextProvider;
|
| + scoped_refptr<VideoContextProvider> video_context_provider_;
|
|
|
| bool record_full_layer_;
|
|
|
| @@ -80,6 +82,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
|
| // read on renderer main thread.
|
| base::Lock num_hardware_compositor_lock_;
|
| unsigned int num_hardware_compositors_;
|
| + scoped_refptr<base::MessageLoopProxy> main_thread_proxy_;
|
| };
|
|
|
| } // namespace content
|
|
|