Use C bindings to Mojo GL entry points exclusively.

mojo/skia/gl_bindings_skia.cc

Index: mojo/skia/gl_bindings_skia.cc
diff --git a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc b/mojo/skia/gl_bindings_skia.cc
similarity index 89%
rename from gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
rename to mojo/skia/gl_bindings_skia.cc
index 021afabe87e104bcf2b7ba31cc74688ff1b4db02..68f849487cc1bd7d4ac0962b2c216bc8df139a3e 100644
--- a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
+++ b/mojo/skia/gl_bindings_skia.cc
@@ -2,24 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "gpu/skia_bindings/gl_bindings_skia_cmd_buffer.h"
+#include "mojo/skia/gl_bindings_skia.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
-#include "gpu/GLES2/gl2extchromium.h"
-#include "third_party/khronos/GLES2/gl2.h"
-#include "third_party/khronos/GLES2/gl2ext.h"
+#include "mojo/public/c/gpu/GLES2/gl2.h"
+#include "mojo/public/c/gpu/GLES2/gl2ext.h"
+#include "mojo/public/c/gpu/GLES2/gl2extmojo.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 
 namespace skia_bindings {
 
-GrGLInterface* CreateCommandBufferSkiaGLBinding() {
+GrGLInterface* CreateMojoSkiaGLBinding() {
   GrGLInterface* interface = new GrGLInterface;
   interface->fStandard = kGLES_GrGLStandard;
-  interface->fExtensions.init(kGLES_GrGLStandard,
-                              glGetString,
-                              NULL,
+  interface->fExtensions.init(kGLES_GrGLStandard, glGetString, nullptr,
                               glGetIntegerv);
 
   GrGLInterface::Functions* functions = &interface->fFunctions;
@@ -132,22 +130,21 @@ GrGLInterface* CreateCommandBufferSkiaGLBinding() {
   functions->fFramebufferRenderbuffer = glFramebufferRenderbuffer;
   functions->fFramebufferTexture2D = glFramebufferTexture2D;
   functions->fFramebufferTexture2DMultisample =
-    glFramebufferTexture2DMultisampleEXT;
+      glFramebufferTexture2DMultisampleEXT;
   functions->fGenFramebuffers = glGenFramebuffers;
   functions->fGenRenderbuffers = glGenRenderbuffers;
   functions->fGetFramebufferAttachmentParameteriv =
-    glGetFramebufferAttachmentParameteriv;
+      glGetFramebufferAttachmentParameteriv;
   functions->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;
   functions->fRenderbufferStorage = glRenderbufferStorage;
-  functions->fRenderbufferStorageMultisample =
-    glRenderbufferStorageMultisampleCHROMIUM;
+  functions->fRenderbufferStorageMultisample = nullptr;  // TODO: Implement.
   functions->fRenderbufferStorageMultisampleES2EXT =
-    glRenderbufferStorageMultisampleEXT;
+      glRenderbufferStorageMultisampleEXT;
   functions->fBindUniformLocation = glBindUniformLocationCHROMIUM;
-  functions->fBlitFramebuffer = glBlitFramebufferCHROMIUM;
+  functions->fBlitFramebuffer = nullptr;  // TODO: Implement.
   functions->fGenerateMipmap = glGenerateMipmap;
-  functions->fMatrixLoadf = glMatrixLoadfCHROMIUM;
-  functions->fMatrixLoadIdentity = glMatrixLoadIdentityCHROMIUM;
+  functions->fMatrixLoadf = nullptr;         // TODO: Implement.
+  functions->fMatrixLoadIdentity = nullptr;  // TODO: Implement.
 
   return interface;
 }