Roll skia to r2034 (and add new gl bindings)

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 146 matching lines @@
 }
 
 GLvoid StubGLDisableVertexAttribArray(GLuint index) {
   glDisableVertexAttribArray(index);
 }
 
 GLvoid StubGLDrawArrays(GLenum mode, GLint first, GLsizei count) {
   glDrawArrays(mode, first, count);
 }
 
+GLvoid StubGLDrawBuffer(GLenum mode) {
+  glDrawBuffer(mode);
+}
+
+GLvoid StubGLDrawBuffers(GLsizei n, const GLenum* bufs) {
+  glDrawBuffersARB(n, bufs);
+}
+
 GLvoid StubGLDrawElements(GLenum mode, GLsizei count, GLenum type,
                           const void* indices) {
   glDrawElements(mode, count, type, indices);
 }
 
 GLvoid StubGLEnable(GLenum cap) {
   glEnable(cap);
 }
 
 GLvoid StubGLEnableVertexAttribArray(GLuint index) {
@@ skipping 96 matching lines @@
 }
 
 void* StubGLMapBuffer(GLenum target, GLenum access) {
   return glMapBuffer(target, access);
 }
 
 GLvoid StubGLPixelStorei(GLenum pname, GLint param) {
   glPixelStorei(pname, param);
 }
 
+GLvoid StubGLReadBuffer(GLenum src) {
+  glReadBuffer(src);
+}
+
 GLvoid StubGLReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
                         GLenum format, GLenum type, void* pixels) {
   glReadPixels(x, y, width, height, format, type, pixels);
 }
 
 GLvoid StubGLRenderBufferStorage(GLenum target, GLenum internalformat,
                                  GLsizei width, GLsizei height) {
   glRenderbufferStorageEXT(target, internalformat, width, height);
 }
 
@@ skipping 219 matching lines @@
       StubGLCullFace,
       StubGLDeleteBuffers,
       StubGLDeleteProgram,
       StubGLDeleteShader,
       StubGLDeleteTextures,
       StubGLDepthMask,
       StubGLDisable,
       NULL,  // glDisableClientState
       StubGLDisableVertexAttribArray,
       StubGLDrawArrays,
+      StubGLDrawBuffer,
+      StubGLDrawBuffers,
       StubGLDrawElements,
       StubGLEnable,
       NULL,  // glEnableClientState
       StubGLEnableVertexAttribArray,
       StubGLFrontFace,
       StubGLGenBuffers,
       StubGLGenTextures,
       StubGLGetBufferParameteriv,
       StubGLGetError,
       StubGLGetIntegerv,
       StubGLGetProgramInfoLog,
       StubGLGetProgramiv,
       StubGLGetShaderInfoLog,
       StubGLGetShaderiv,
       StubGLGetString,
       StubGLGetTexLevelParameteriv,
       StubGLGetUniformLocation,
       StubGLLineWidth,
       StubGLLinkProgram,
       NULL,  // glLoadMatrixf
       NULL,  // glMatrixMode
       StubGLPixelStorei,
       NULL,  // glPointSize
+      StubGLReadBuffer,
       StubGLReadPixels,
       StubGLScissor,
       NULL,  // glShadeModel
       StubGLShaderSource,
       StubGLStencilFunc,
       StubGLStencilFuncSeparate,
       StubGLStencilMask,
       StubGLStencilMaskSeparate,
       StubGLStencilOp,
       StubGLStencilOpSeparate,
@@ skipping 46 matching lines @@
       StubBindFragDataLocationIndexedARB,
       GrGLInterface::kStaticInitEndGuard,
     };
     GrGLSetGLInterface(&host_gl_interface);
     host_StubGL_installed = true;
   }
 }
 
 }  // namespace gfx