Bind GrContext to GLES2Interface rather than C GLES interface

content/common/gpu/client/grcontext_for_webgraphicscontext3d.cc

 // Copyright (c) 2013 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/common/gpu/client/grcontext_for_webgraphicscontext3d.h"
 
 #include <stddef.h>
 #include <string.h>
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "gpu/blink/webgraphicscontext3d_impl.h"
 #include "gpu/command_buffer/client/gles2_lib.h"
 #include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
 #include "third_party/skia/include/gpu/GrContext.h"
 
 using gpu_blink::WebGraphicsContext3DImpl;
 
 namespace content {
 
-namespace {
-
-// Singleton used to initialize and terminate the gles2 library.
-class GLES2Initializer {
- public:
-  GLES2Initializer() { gles2::Initialize(); }
-
-  ~GLES2Initializer() { gles2::Terminate(); }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(GLES2Initializer);
-};
-
-base::LazyInstance<GLES2Initializer> g_gles2_initializer =
-    LAZY_INSTANCE_INITIALIZER;
-
-void BindWebGraphicsContext3DGLContextCallback(const GrGLInterface* interface) {
-  gles2::SetGLContext(static_cast<const GrGLInterfaceForWebGraphicsContext3D*>(
-                          interface)->WebContext3D()->GetGLInterface());
-}
-
-}  // namespace anonymous
-
 GrContextForWebGraphicsContext3D::GrContextForWebGraphicsContext3D(
     skia::RefPtr<GrGLInterfaceForWebGraphicsContext3D> gr_interface) {
   if (!gr_interface || !gr_interface->WebContext3D())
     return;
 
-  // Ensure the gles2 library is initialized first in a thread safe way.
-  g_gles2_initializer.Get();
-  gles2::SetGLContext(gr_interface->WebContext3D()->GetGLInterface());
-
-  skia_bindings::InitCommandBufferSkiaGLBinding(gr_interface.get());
-
-  gr_interface->fCallback = BindWebGraphicsContext3DGLContextCallback;
+  skia_bindings::InitGLES2InterfaceBindings(
+      gr_interface.get(), gr_interface->WebContext3D()->GetGLInterface());
 
   gr_context_ = skia::AdoptRef(GrContext::Create(
       kOpenGL_GrBackend,
       reinterpret_cast<GrBackendContext>(gr_interface.get())));
   if (gr_context_) {
     // The limit of the number of GPU resources we hold in the GrContext's
     // GPU cache.
     static const int kMaxGaneshResourceCacheCount = 2048;
     // The limit of the bytes allocated toward GPU resources in the GrContext's
     // GPU cache.
@@ skipping 31 matching lines @@
 GrGLInterfaceForWebGraphicsContext3D::~GrGLInterfaceForWebGraphicsContext3D() {
   DCHECK(context_thread_checker_.CalledOnValidThread());
 #if !defined(NDEBUG)
   // Set all the function pointers to zero, in order to crash if function
   // pointers are used after free.
   memset(&fFunctions, 0, sizeof(GrGLInterface::Functions));
 #endif
 }
 
 }  // namespace content