Use ContextProvider subclass to provide WGC3D pointers

content/common/gpu/client/context_provider_command_buffer.h

Index: content/common/gpu/client/context_provider_command_buffer.h
diff --git a/content/common/gpu/client/context_provider_command_buffer.h b/content/common/gpu/client/context_provider_command_buffer.h
index 036968493174d239865d58a8a15dbfa89871d0e6..9f0cbb784966890a9ff8d970609833b883db1415 100644
--- a/content/common/gpu/client/context_provider_command_buffer.h
+++ b/content/common/gpu/client/context_provider_command_buffer.h
@@ -11,6 +11,7 @@
 #include "base/threading/thread_checker.h"
 #include "cc/output/context_provider.h"
 #include "content/common/content_export.h"
+#include "content/common/gpu/client/context_provider_web_context.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 
 namespace webkit {
@@ -24,7 +25,7 @@ namespace content {
 // Implementation of cc::ContextProvider that provides a
 // WebGraphicsContext3DCommandBufferImpl context and a GrContext.
 class CONTENT_EXPORT ContextProviderCommandBuffer
-    : NON_EXPORTED_BASE(public cc::ContextProvider) {
+    : public ContextProviderWebContext {
  public:
   static scoped_refptr<ContextProviderCommandBuffer> Create(
       scoped_ptr<WebGraphicsContext3DCommandBufferImpl> context3d,
@@ -38,6 +39,9 @@ class CONTENT_EXPORT ContextProviderCommandBuffer
     leak_on_destroy_ = true;
   }
 
+  // ContextProviderWebContext implementation.
+  virtual blink::WebGraphicsContext3D* WebContext3D() OVERRIDE;

[piman, 2014/01/08 01:22:50]

nit: you can return WebGraphicsContext3DCommandBufferImpl* here (covariant
return) and save the static cast in renderer_gpu_video_accelerator_factories.

[jamesr, 2014/01/08 02:20:15]

oh, good idea. done

+
   // cc::ContextProvider implementation.
   virtual bool BindToCurrentThread() OVERRIDE;
   virtual gpu::gles2::GLES2Interface* ContextGL() OVERRIDE;