| 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 81a49301d21577f025a6ab90560f341adde98643..4fde0d4ecba8a0b40812ef0f560f08deb4e7ea11 100644
|
| --- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h
|
| +++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h
|
| @@ -8,6 +8,7 @@
|
| #include "base/synchronization/lock.h"
|
| #include "cc/blink/context_provider_web_context.h"
|
| #include "content/browser/android/in_process/synchronous_input_event_filter.h"
|
| +#include "content/public/browser/android/synchronous_compositor.h"
|
| #include "content/renderer/android/synchronous_compositor_factory.h"
|
| #include "content/renderer/media/android/stream_texture_factory_synchronous_impl.h"
|
| #include "gpu/command_buffer/service/in_process_command_buffer.h"
|
| @@ -51,8 +52,8 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
|
| return &synchronous_input_event_filter_;
|
| }
|
|
|
| - void SetDeferredGpuService(
|
| - scoped_refptr<gpu::InProcessCommandBuffer::Service> service);
|
| + void SetCreateContextCallback(
|
| + SynchronousCompositor::CreateContextCallback callback);
|
| void SetRecordFullDocument(bool record_full_document);
|
| void CompositorInitializedHardwareDraw();
|
| void CompositorReleasedHardwareDraw();
|
| @@ -62,12 +63,12 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory {
|
| private:
|
| bool CanCreateMainThreadContext();
|
| scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>
|
| - TryCreateStreamTextureFactory();
|
| + TryCreateStreamTextureFactory();
|
| void RestoreContextOnMainThread();
|
|
|
| SynchronousInputEventFilter synchronous_input_event_filter_;
|
|
|
| - scoped_refptr<gpu::InProcessCommandBuffer::Service> service_;
|
| + SynchronousCompositor::CreateContextCallback callback_;
|
|
|
| class VideoContextProvider;
|
| scoped_refptr<VideoContextProvider> video_context_provider_;
|
|
|