android: Pass cc::ContextProvider to VideoContextProvider.

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
 
 #include "base/command_line.h"
 #include "base/observer_list.h"
 #include "content/browser/android/in_process/synchronous_compositor_external_begin_frame_source.h"
 #include "content/browser/android/in_process/synchronous_compositor_impl.h"
@@ skipping 65 matching lines @@
       WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext(
           context.Pass(), attributes));
 }
 
 }  // namespace
 
 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();
   }
 
   scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
       uint32 stream_id) override {
     return gl_in_process_context_->GetSurfaceTexture(stream_id);
   }
 
   gpu::gles2::GLES2Interface* ContextGL() override {
     return context_provider_->ContextGL();
@@ skipping 154 matching lines @@
         scoped_refptr<StreamTextureFactorySynchronousImpl::ContextProvider>();
   }
 
   if (!video_context_provider_.get()) {
     DCHECK(service_.get());
 
     blink::WebGraphicsContext3D::Attributes attributes = GetDefaultAttribs();
     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_;
 }
 
 void SynchronousCompositorFactoryImpl::SetDeferredGpuService(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   DCHECK(!service_.get());
   service_ = service;
 }
 
 void SynchronousCompositorFactoryImpl::SetRecordFullDocument(
     bool record_full_document) {
   record_full_layer_ = record_full_document;
 }
 
 }  // namespace content