Roll skia to 2303

ui/gfx/gl/gl_bindings_skia_in_process.cc

 // Copyright (c) 2011 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 "ui/gfx/gl/gl_bindings_skia_in_process.h"
 
 #include "base/logging.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_implementation.h"
@@ skipping 17 matching lines @@
 
 GLvoid StubGLBindAttribLocation(GLuint program, GLuint index,
                                 const char* name) {
   glBindAttribLocation(program, index, name);
 }
 
 GLvoid StubGLBindBuffer(GLenum target, GLuint buffer) {
   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);
 }
 
 GLvoid StubGLBindFramebuffer(GLenum target, GLuint framebuffer) {
   glBindFramebufferEXT(target, framebuffer);
 }
 
 GLvoid StubGLBindRenderbuffer(GLenum target, GLuint renderbuffer) {
   glBindRenderbufferEXT(target, renderbuffer);
 }
@@ skipping 442 matching lines @@
       return NULL;
   }
 
   GrGLInterface* interface = new GrGLInterface;
 
   interface->fBindingsExported = binding;
   interface->fActiveTexture = StubGLActiveTexture;
   interface->fAttachShader = StubGLAttachShader;
   interface->fBindAttribLocation = StubGLBindAttribLocation;
   interface->fBindBuffer = StubGLBindBuffer;
+  interface->fBindFragDataLocation = StubGLBindFragDataLocation;
   interface->fBindTexture = StubGLBindTexture;
   interface->fBlendColor = StubGLBlendColor;
   interface->fBlendFunc = StubGLBlendFunc;
   interface->fBufferData = StubGLBufferData;
   interface->fBufferSubData = StubGLBufferSubData;
   interface->fClear = StubGLClear;
   interface->fClearColor = StubGLClearColor;
   interface->fClearStencil = StubGLClearStencil;
   interface->fColorMask = StubGLColorMask;
   interface->fCompileShader = StubGLCompileShader;
@@ skipping 78 matching lines @@
   interface->fGetFramebufferAttachmentParameteriv =
     StubGLGetFramebufferAttachmentParameteriv;
   interface->fGetRenderbufferParameteriv = StubGLGetRenderbufferParameteriv;
   interface->fRenderbufferStorage = StubGLRenderbufferStorage;
   interface->fRenderbufferStorageMultisample =
     StubGLRenderbufferStorageMultisample;
   interface->fBlitFramebuffer = StubGLBlitFramebuffer;
   interface->fMapBuffer = StubGLMapBuffer;
   interface->fUnmapBuffer = StubGLUnmapBuffer;
   interface->fBindFragDataLocationIndexed =
-    StubBindFragDataLocationIndexedARB;
+    StubGLBindFragDataLocationIndexedARB;
   return interface;
 }
 
 }  // namespace gfx