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

webkit/gpu/webgraphicscontext3d_in_process_impl.cc

 // Copyright (c) 2011 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 "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 89 matching lines @@
   }
   AngleDestroyCompilers();
 }
 
 bool WebGraphicsContext3DInProcessImpl::initialize(
     WebGraphicsContext3D::Attributes attributes,
     WebView* webView,
     bool render_directly_to_web_view) {
   if (!gfx::GLSurface::InitializeOneOff())
     return false;
-  gfx::BindSkiaToInProcessGL();
 
   render_directly_to_web_view_ = render_directly_to_web_view;
   gfx::GLShareGroup* share_group = 0;
 
   if (!render_directly_to_web_view) {
     // Pick up the compositor's context to share resources with.
     WebGraphicsContext3D* view_context = webView ?
                                          webView->graphicsContext3D() : NULL;
     if (view_context) {
       WebGraphicsContext3DInProcessImpl* contextImpl =
@@ skipping 1424 matching lines @@
 void WebGraphicsContext3DInProcessImpl::deleteTexture(WebGLId texture) {
   makeContextCurrent();
   glDeleteTextures(1, &texture);
 }
 
 WGC3Denum WebGraphicsContext3DInProcessImpl::getGraphicsResetStatusARB() {
   // TODO(kbr): this implementation doesn't support lost contexts yet.
   return GL_NO_ERROR;
 }
 
+#if WEBKIT_USING_SKIA
+GrGLInterface* WebGraphicsContext3DInProcessImpl::grGLInterface() {
+  return gfx::GetInProcessSkiaGLBinding();
+}
+#endif
+
 bool WebGraphicsContext3DInProcessImpl::AngleCreateCompilers() {
   if (!ShInitialize())
     return false;
 
   ShBuiltInResources resources;
   ShInitBuiltInResources(&resources);
   getIntegerv(GL_MAX_VERTEX_ATTRIBS, &resources.MaxVertexAttribs);
   getIntegerv(MAX_VERTEX_UNIFORM_VECTORS, &resources.MaxVertexUniformVectors);
   getIntegerv(MAX_VARYING_VECTORS, &resources.MaxVaryingVectors);
   getIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS,
@@ skipping 60 matching lines @@
   if (length > 1) {
     entry->translated_source.reset(new char[length]);
     ShGetObjectCode(compiler, entry->translated_source.get());
   }
   entry->is_valid = true;
   return true;
 }
 
 }  // namespace gpu
 }  // namespace webkit