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..342134fbdf270e8bea0f9ee1e4913ad65aac4236 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_refptr<cc::ContextProvider> context_provider,
       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");
+      : context_provider_(context_provider),
+        gl_in_process_context_(gl_in_process_context.get()) {
     context_provider_->BindToCurrentThread();
   }
 
@@ -262,9 +261,14 @@ 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);
+    video_context_provider_ = new VideoContextProvider(
+        webkit::gpu::ContextProviderInProcess::Create(
+            WrapContext(context.Pass(), GetDefaultAttribs()),
+            "Video-Offscreen-main-thread"),
+        context.Pass());

[tfarina, 2015/04/07 23:16:27]

This second Pass() isn't really right, is it? Is there a better way to do this?

[boliu, 2015/04/08 03:26:08]

Right, scoped_ptr can't be passed twice. The second time will just pass a
nullptr.

You can use a raw pointer:

scoped_ptr<gpu::GLInProcessContext> context = ...;
gpu::GLInProcessContext* context_pointer = context.get();
video_context_provider_ = new VideoContextProvider(..., context_pointer);

[tfarina, 2015/04/08 19:37:20]

Done.

   }
   return video_context_provider_;
 }