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 40bcbac57fd02a4c23c9e66eeb3e0f4961787a22..1e7987fc5a9a53340e3002ccf24d83b9de93d745 100644 |
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.h |
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.h |
@@ -9,6 +9,7 @@ |
#include "content/browser/android/in_process/synchronous_input_event_filter.h" |
#include "content/renderer/android/synchronous_compositor_factory.h" |
#include "content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h" |
+#include "webkit/common/gpu/context_provider_web_context.h" |
namespace gpu { |
class GLInProcessContext; |
@@ -33,7 +34,7 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { |
virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(int routing_id) |
OVERRIDE; |
virtual InputHandlerManagerClient* GetInputHandlerManagerClient() OVERRIDE; |
- virtual scoped_refptr<cc::ContextProvider> |
+ virtual scoped_refptr<webkit::gpu::ContextProviderWebContext> |
GetOffscreenContextProviderForMainThread() OVERRIDE; |
// This is called on both renderer main thread (offscreen context creation |
// path shared between cross-process and in-process platforms) and renderer |
@@ -66,7 +67,8 @@ class SynchronousCompositorFactoryImpl : public SynchronousCompositorFactory { |
// Only guards construction and destruction of |
// |offscreen_context_for_compositor_thread_|, not usage. |
base::Lock offscreen_context_for_compositor_thread_lock_; |
- scoped_refptr<cc::ContextProvider> offscreen_context_for_main_thread_; |
+ scoped_refptr<webkit::gpu::ContextProviderWebContext> |
+ offscreen_context_for_main_thread_; |
// This is a pointer to the context owned by |
// |offscreen_context_for_main_thread_|. |
gpu::GLInProcessContext* wrapped_gl_context_for_main_thread_; |