Roll skia to 2303

Review URL: http://codereview.chromium.org/7977031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102366 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 3 deletions

diff --git a/ui/gfx/gl/generate_bindings.py b/ui/gfx/gl/generate_bindings.py
index 055e4e4..a39a1f5 100644
--- a/ui/gfx/gl/generate_bindings.py
+++ b/ui/gfx/gl/generate_bindings.py
@@ -16,6 +16,8 @@ GL_FUNCTIONS = [
 ['void', ['glBindAttribLocation'],
     'GLuint program, GLuint index, const char* name'],
 ['void', ['glBindBuffer'], 'GLenum target, GLuint buffer'],
+['void', ['glBindFragDataLocation'],
+    'GLuint program, GLuint colorNumber, const char* name'],
 ['void', ['glBindFragDataLocationIndexedARB'],
     'GLuint program, GLuint colorNumber, GLuint index, const char* name'],
 ['void', ['glBindFramebufferEXT', 'glBindFramebuffer'],
diff --git a/ui/gfx/gl/gl_bindings_skia_in_process.cc b/ui/gfx/gl/gl_bindings_skia_in_process.cc
index aa92603..dfd4e57 100644
--- a/ui/gfx/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gfx/gl/gl_bindings_skia_in_process.cc
@@ -35,8 +35,13 @@ 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);
 }
 
@@ -499,6 +504,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   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 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   interface->fMapBuffer = StubGLMapBuffer;
   interface->fUnmapBuffer = StubGLUnmapBuffer;
   interface->fBindFragDataLocationIndexed =
-    StubBindFragDataLocationIndexedARB;
+    StubGLBindFragDataLocationIndexedARB;
   return interface;
 }
 
diff --git a/ui/gfx/gl/gl_interface.h b/ui/gfx/gl/gl_interface.h
index c7fbf8a..b4e82b5 100644
--- a/ui/gfx/gl/gl_interface.h
+++ b/ui/gfx/gl/gl_interface.h
@@ -39,6 +39,10 @@ class GL_EXPORT GLInterface {
                                               GLuint index,
                                               const char* name) = 0;
 
+  virtual void BindFragDataLocation(GLuint program,
+                                    GLuint colorNumber,
+                                    const char* name) = 0;
+
   virtual void BindFramebufferEXT(GLenum target, GLuint framebuffer) = 0;
 
   virtual void BindRenderbufferEXT(GLenum target, GLuint renderbuffer) = 0;