Roll skia to r2034 (and add new gl bindings)

ui/gfx/gl/gl_interface.h

 // 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.
 
 // This file implements glue to a GL interface so we can mock it for unit
 // testing. It has to be Desktop GL, not GLES2 as it is used to test the service
 // side code.
 
 #ifndef UI_GFX_GL_GL_INTERFACE_H_
 #define UI_GFX_GL_GL_INTERFACE_H_
@@ skipping 150 matching lines @@
   virtual void DepthRangef(GLclampf zNear, GLclampf zFar) = 0;
 
   virtual void DetachShader(GLuint program, GLuint shader) = 0;
 
   virtual void Disable(GLenum cap) = 0;
 
   virtual void DisableVertexAttribArray(GLuint index) = 0;
 
   virtual void DrawArrays(GLenum mode, GLint first, GLsizei count) = 0;
 
+  virtual void DrawBuffer(GLenum mode) = 0;
+
+  virtual void DrawBuffersARB(GLsizei n, const GLenum* bufs) = 0;
+
   virtual void DrawElements(GLenum mode,
                             GLsizei count,
                             GLenum type,
                             const void* indices) = 0;
 
   virtual void EGLImageTargetTexture2DOES(
       GLenum target, GLeglImageOES image) = 0;
 
   virtual void Enable(GLenum cap) = 0;
 
@@ skipping 158 matching lines @@
   virtual void* MapBuffer(GLenum target, GLenum access) = 0;
 
   virtual void LineWidth(GLfloat width) = 0;
 
   virtual void LinkProgram(GLuint program) = 0;
 
   virtual void PixelStorei(GLenum pname, GLint param) = 0;
 
   virtual void PolygonOffset(GLfloat factor, GLfloat units) = 0;
 
+  virtual void ReadBuffer(GLenum src) = 0;
+
   virtual void ReadPixels(GLint x, GLint y,
                           GLsizei width, GLsizei height,
                           GLenum format,
                           GLenum type,
                           void* pixels) = 0;
 
   virtual void ReleaseShaderCompiler(void) = 0;
 
   virtual void RenderbufferStorageEXT(GLenum target,
                                       GLenum internalformat,
@@ skipping 188 matching lines @@
 
   virtual GLenum GetGraphicsResetStatusARB() = 0;
 
  private:
   static GLInterface* interface_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_GL_GL_INTERFACE_H_