cc: Delete ContextProvider::MakeGrContextCurrent.

cc/test/test_in_process_context_provider.cc

 // Copyright 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 "cc/test/test_in_process_context_provider.h"
 
 #include "base/lazy_instance.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
@@ skipping 45 matching lines @@
 bool TestInProcessContextProvider::BindToCurrentThread() { return true; }
 
 gpu::gles2::GLES2Interface* TestInProcessContextProvider::ContextGL() {
   return context_->GetImplementation();
 }
 
 gpu::ContextSupport* TestInProcessContextProvider::ContextSupport() {
   return context_->GetImplementation();
 }
 
-static void BindGrContextCallback(const GrGLInterface* interface) {
-#if GR_GL_PER_GL_FUNC_CALLBACK
-  reinterpret_cast<TestInProcessContextProvider*>(interface->fCallbackData)
-      ->MakeGrContextCurrent();
-#endif  // GR_GL_PER_GL_FUNC_CALLBACK
-}
-
-class GrContext* TestInProcessContextProvider::GrContext() {
-  if (gr_context_)
-    return gr_context_.get();
-
-  skia::RefPtr<GrGLInterface> interface =
-      skia::AdoptRef(skia_bindings::CreateCommandBufferSkiaGLBinding());
-#if GR_GL_PER_GL_FUNC_CALLBACK
-  interface->fCallback = BindGrContextCallback;
-  interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(this);
-#endif  // GR_GL_PER_GL_FUNC_CALLBACK
-
-  gr_context_ = skia::AdoptRef(GrContext::Create(
-      kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(interface.get())));
-
-  return gr_context_.get();
-}
-
 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);
 };
 
 static base::LazyInstance<GLES2Initializer> g_gles2_initializer =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
-void TestInProcessContextProvider::MakeGrContextCurrent() {
+static void BindGrContextCallback(const GrGLInterface* interface) {
+#if GR_GL_PER_GL_FUNC_CALLBACK

[jamesr, 2014/01/16 19:31:07]

i've seen this #if guard in multiple places, but it looks like chrome will
always set this:

https://code.google.com/p/chromium/codesearch#chromium/src/third_party/skia/i...

so is the guard useful?

[alokp, 2014/01/16 22:00:47]

Good point. It will be better to remove this guard to ensure that we always
compile skia with GR_GL_PER_GL_FUNC_CALLBACK. Done.

+  TestInProcessContextProvider* context_provider =
+      reinterpret_cast<TestInProcessContextProvider*>(interface->fCallbackData);
+
   // Make sure the gles2 library is initialized first on exactly one thread.
   g_gles2_initializer.Get();
+  gles2::SetGLContext(context_provider->ContextGL());
+#endif  // GR_GL_PER_GL_FUNC_CALLBACK
+}
 
-  gles2::SetGLContext(context_->GetImplementation());
+class GrContext* TestInProcessContextProvider::GrContext() {
+  if (gr_context_)
+    return gr_context_.get();
+
+  skia::RefPtr<GrGLInterface> interface =
+      skia::AdoptRef(skia_bindings::CreateCommandBufferSkiaGLBinding());
+#if GR_GL_PER_GL_FUNC_CALLBACK
+  interface->fCallback = BindGrContextCallback;
+  interface->fCallbackData = reinterpret_cast<GrGLInterfaceCallbackData>(this);
+#endif  // GR_GL_PER_GL_FUNC_CALLBACK
+
+  gr_context_ = skia::AdoptRef(GrContext::Create(
+      kOpenGL_GrBackend, reinterpret_cast<GrBackendContext>(interface.get())));
+
+  return gr_context_.get();
 }
 
 ContextProvider::Capabilities
 TestInProcessContextProvider::ContextCapabilities() {
   return ContextProvider::Capabilities();
 }
 
 bool TestInProcessContextProvider::IsContextLost() { return false; }
 
 void TestInProcessContextProvider::VerifyContexts() {}
 
 bool TestInProcessContextProvider::DestroyedOnMainThread() { return false; }
 
 void TestInProcessContextProvider::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {}
 
 void TestInProcessContextProvider::SetMemoryPolicyChangedCallback(
     const MemoryPolicyChangedCallback& memory_policy_changed_callback) {}
 
 }  // namespace cc