Roll skia to 2303

ui/gfx/gl/gl_bindings_skia_in_process.cc

Index: ui/gfx/gl/gl_bindings_skia_in_process.cc
===================================================================
--- ui/gfx/gl/gl_bindings_skia_in_process.cc	(revision 102154)
+++ ui/gfx/gl/gl_bindings_skia_in_process.cc	(working copy)
@@ -35,8 +35,13 @@
   glBindBuffer(target, buffer);
 }
 
-GLvoid StubBindFragDataLocationIndexedARB(GLuint program, GLuint colorNumber,
-                                          GLuint index, const GLchar * name) {
+GLvoid StubGLBindFragDataLocation(GLuint program, GLuint colorNumber,
+                                  const GLchar * name) {
+  glBindFragDataLocation(program, colorNumber, name);
+}
+
+GLvoid StubGLBindFragDataLocationIndexedARB(GLuint program, GLuint colorNumber,
+                                            GLuint index, const GLchar * name) {
   glBindFragDataLocationIndexedARB(program, colorNumber, index, name);
 }
 
@@ -499,6 +504,7 @@
   interface->fAttachShader = StubGLAttachShader;
   interface->fBindAttribLocation = StubGLBindAttribLocation;
   interface->fBindBuffer = StubGLBindBuffer;
+  interface->fBindFragDataLocation = StubGLBindFragDataLocation;
   interface->fBindTexture = StubGLBindTexture;
   interface->fBlendColor = StubGLBlendColor;
   interface->fBlendFunc = StubGLBlendFunc;
@@ -597,7 +603,7 @@
   interface->fMapBuffer = StubGLMapBuffer;
   interface->fUnmapBuffer = StubGLUnmapBuffer;
   interface->fBindFragDataLocationIndexed =
-    StubBindFragDataLocationIndexedARB;
+    StubGLBindFragDataLocationIndexedARB;
   return interface;
 }