android: Pass cc::ContextProvider to VideoContextProvider.

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

Index: content/browser/android/in_process/synchronous_compositor_factory_impl.cc
diff --git a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
index 470743a547ca066e1f434035ec6e4df9038b3b64..f79515d062ca583c26bc011971e19c924856db4a 100644
--- a/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
+++ b/content/browser/android/in_process/synchronous_compositor_factory_impl.cc
@@ -83,11 +83,10 @@ class SynchronousCompositorFactoryImpl::VideoContextProvider
     : public StreamTextureFactorySynchronousImpl::ContextProvider {
  public:
   VideoContextProvider(
-      scoped_ptr<gpu::GLInProcessContext> gl_in_process_context)
-      : gl_in_process_context_(gl_in_process_context.get()) {
-    context_provider_ = webkit::gpu::ContextProviderInProcess::Create(
-        WrapContext(gl_in_process_context.Pass(), GetDefaultAttribs()),
-        "Video-Offscreen-main-thread");
+      scoped_refptr<cc::ContextProvider> context_provider,
+      gpu::GLInProcessContext* gl_in_process_context)

[tfarina, 2015/04/08 20:56:46]

Making this a raw pointer was necessary to fix:

../../content/browser/android/in_process/synchronous_compositor_factory_impl.cc:268:35:
error: no matching constructor for initialization of
'content::SynchronousCompositorFactoryImpl::VideoContextProvider'
    video_context_provider_ = new VideoContextProvider(
                                  ^
../../content/browser/android/in_process/synchronous_compositor_factory_impl.cc:85:3:
note: candidate constructor not viable: no known conversion from
'gpu::GLInProcessContext *' to 'scoped_ptr<gpu::GLInProcessContext>' for 2nd
argument
  VideoContextProvider(
  ^
../../content/browser/android/in_process/synchronous_compositor_factory_impl.cc:124:28:
note: candidate constructor not viable: requires 1 argument, but 2 were provided
  DISALLOW_COPY_AND_ASSIGN(VideoContextProvider);
                           ^
../../base/macros.h:27:3: note: expanded from macro 'DISALLOW_COPY_AND_ASSIGN'
  TypeName(const TypeName&);               \
  ^
1 error generated.

[boliu, 2015/04/08 20:59:33]

Yep that's fine.

+      : context_provider_(context_provider),
+        gl_in_process_context_(gl_in_process_context) {
     context_provider_->BindToCurrentThread();
   }
 
@@ -262,9 +261,15 @@ SynchronousCompositorFactoryImpl::TryCreateStreamTextureFactory() {
     attributes.shareResources = false;
     // This needs to run in on-screen |service_| context due to SurfaceTexture
     // limitations.
-    video_context_provider_ = new VideoContextProvider(CreateContextHolder(
-        attributes, service_, gpu::GLInProcessContextSharedMemoryLimits(),
-        false));
+    scoped_ptr<gpu::GLInProcessContext> context =
+        CreateContextHolder(attributes, service_,
+                            gpu::GLInProcessContextSharedMemoryLimits(), false);
+    gpu::GLInProcessContext* context_ptr = context.get();
+    video_context_provider_ = new VideoContextProvider(
+        webkit::gpu::ContextProviderInProcess::Create(
+            WrapContext(context.Pass(), GetDefaultAttribs()),

[boliu, 2015/04/08 20:59:33]

reuse |attributes| here

[tfarina, 2015/04/08 21:17:24]

Done.

+            "Video-Offscreen-main-thread"),
+        context_ptr);
   }
   return video_context_provider_;
 }