Bind GrContext to GLES2Interface rather than C GLES interface

android_webview/browser/aw_render_thread_context_provider.cc

Index: android_webview/browser/aw_render_thread_context_provider.cc
diff --git a/android_webview/browser/aw_render_thread_context_provider.cc b/android_webview/browser/aw_render_thread_context_provider.cc
index 27dbf714b97bba5d9348f52f5d56fcab8b539c29..801cd7f7c7401658a16af05be62e2105f0202c1b 100644
--- a/android_webview/browser/aw_render_thread_context_provider.cc
+++ b/android_webview/browser/aw_render_thread_context_provider.cc
@@ -19,24 +19,6 @@
 
 namespace android_webview {
 
-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;
-
-}  // namespace
-
 // static
 scoped_refptr<AwRenderThreadContextProvider>
 AwRenderThreadContextProvider::Create(
@@ -111,29 +93,14 @@ gpu::ContextSupport* AwRenderThreadContextProvider::ContextSupport() {
   return context_->GetImplementation();
 }
 
-static void BindGrContextCallback(const GrGLInterface* interface) {
-  cc::ContextProvider* context_provider =
-      reinterpret_cast<AwRenderThreadContextProvider*>(
-          interface->fCallbackData);
-
-  gles2::SetGLContext(context_provider->ContextGL());
-}
-
 class GrContext* AwRenderThreadContextProvider::GrContext() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   if (gr_context_)
     return gr_context_.get();
 
-  // The GrGLInterface factory will make GL calls using the C GLES2 interface.
-  // Make sure the gles2 library is initialized first on exactly one thread.
-  g_gles2_initializer.Get();
-  gles2::SetGLContext(ContextGL());
-
   skia::RefPtr<GrGLInterface> interface = skia::AdoptRef(new GrGLInterface);
-  skia_bindings::InitCommandBufferSkiaGLBinding(interface.get());
-  interface->fCallback = BindGrContextCallback;
-  interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(this);
+  skia_bindings::InitGLES2InterfaceBindings(interface.get(), ContextGL());
 
   gr_context_ = skia::AdoptRef(GrContext::Create(
       kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(interface.get())));