Remove WebGraphicsContext3D getter from cc::ContextProvider

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 "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "ui/gl/android/surface_texture.h"
@@ skipping 14 matching lines @@
       const scoped_refptr<cc::ContextProvider>& context_provider,
       gpu::GLInProcessContext* gl_in_process_context)
       : context_provider_(context_provider),
         gl_in_process_context_(gl_in_process_context) {}
 
   virtual scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(
       uint32 stream_id) OVERRIDE {
     return gl_in_process_context_->GetSurfaceTexture(stream_id);
   }
 
-  virtual blink::WebGraphicsContext3D* Context3d() OVERRIDE {
-    return context_provider_->Context3d();
+  virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE {
+    if (context_provider_->IsContextLost())

[danakj, 2014/01/09 21:23:34]

It's kinda weird to have a NULL pointer due to context loss, as that's usually
not what we do.

I see how you're doing this to branch where we used to branch on
makeContextCurrent() because the provider is not exposed only the ContextGL is.

If you're going to do this can you update the comment on the base class to warn
about NULL return values? Maybe it'd be better to just return the
ContextProvider instead of the ContextGL here?

[jamesr, 2014/01/10 00:12:34]

sievers@ - do you know why StreamTextureFactory uses a raw context pointer
instead of a ref to a ContextProvider?  I think using a provider would make a
bit more sense.  I just tried to preserve existing behavior here.

+      return NULL;
+    return context_provider_->ContextGL();
   }
 
  private:
   friend class base::RefCountedThreadSafe<VideoContextProvider>;
   virtual ~VideoContextProvider() {}
 
   scoped_refptr<cc::ContextProvider> context_provider_;
   gpu::GLInProcessContext* gl_in_process_context_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoContextProvider);
@@ skipping 155 matching lines @@
   wrapped_gl_context_for_main_thread_ = context.get();
   if (!context.get())
     return scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>();
 
   return scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl>(
       WebGraphicsContext3DInProcessCommandBufferImpl::WrapContext(
           context.Pass(), attributes));
 }
 
 }  // namespace content