Allow each WGC3D subclass to determine the correct GrGLInterface for its GrContext.

Review URL: http://codereview.chromium.org/7753035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98645 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 1 deletions

diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
index b9e45dc..f3b1166 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
@@ -71,7 +71,6 @@ bool WebGraphicsContext3DCommandBufferImpl::initialize(
     WebKit::WebView* web_view,
     bool render_directly_to_web_view) {
   TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::initialize");
-  webkit_glue::BindSkiaToCommandBufferGL();
   RenderThread* render_thread = RenderThread::current();
   if (!render_thread)
     return false;
@@ -1035,6 +1034,12 @@ void WebGraphicsContext3DCommandBufferImpl::
   swapbuffers_complete_callback_ = cb;
 }
 
+#if WEBKIT_USING_SKIA
+GrGLInterface* WebGraphicsContext3DCommandBufferImpl::grGLInterface() {
+  return webkit_glue::GetCommandBufferSkiaGLBinding();
+}
+#endif
+
 namespace {
 
 WGC3Denum convertReason(RendererGLContext::ContextLostReason reason) {
diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
index 2c4e0a6..37eb884 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h
@@ -430,6 +430,10 @@ class WebGraphicsContext3DCommandBufferImpl
       WebGraphicsContext3D::
           WebGraphicsSwapBuffersCompleteCallbackCHROMIUM* callback);
 
+#if WEBKIT_USING_SKIA
+  virtual GrGLInterface* grGLInterface();
+#endif
+
  private:
   // SwapBuffers callback.
   void OnSwapBuffersComplete();