Roll skia to r2034 (and add new gl bindings)

gpu/command_buffer/common/gl_mock.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 mock GL Interface for unit testing. It has to mock
 // Desktop GL, not GLES2 as it is used to test the service side code.
 
 #ifndef GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
 #define GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_
 #pragma once
@@ skipping 117 matching lines @@
   MOCK_METHOD2(DepthRangef, void(GLclampf zNear, GLclampf zFar));
 
   MOCK_METHOD2(DetachShader, void(GLuint program, GLuint shader));
 
   MOCK_METHOD1(Disable, void(GLenum cap));
 
   MOCK_METHOD1(DisableVertexAttribArray, void(GLuint index));
 
   MOCK_METHOD3(DrawArrays, void(GLenum mode, GLint first, GLsizei count));
 
+  MOCK_METHOD1(DrawBuffer, void(GLenum mode));
+
+  MOCK_METHOD2(DrawBuffersARB, void(GLsizei n, const GLenum* bufs));
+
   MOCK_METHOD4(DrawElements, void(
       GLenum mode, GLsizei count, GLenum type, const void* indices));
 
   MOCK_METHOD2(EGLImageTargetTexture2DOES, void(
       GLenum target, GLeglImageOES image));
 
   MOCK_METHOD1(Enable, void(GLenum cap));
 
   MOCK_METHOD1(EnableVertexAttribArray, void(GLuint index));
 
@@ skipping 117 matching lines @@
   MOCK_METHOD1(LineWidth, void(GLfloat width));
 
   MOCK_METHOD1(LinkProgram, void(GLuint program));
 
   MOCK_METHOD2(MapBuffer, void*(GLenum target, GLenum access));
 
   MOCK_METHOD2(PixelStorei, void(GLenum pname, GLint param));
 
   MOCK_METHOD2(PolygonOffset, void(GLfloat factor, GLfloat units));
 
+  MOCK_METHOD1(ReadBuffer, void(GLenum src));
+
   MOCK_METHOD7(ReadPixels, void(
       GLint x, GLint y, GLsizei width, GLsizei height, GLenum format,
       GLenum type, void* pixels));
 
   MOCK_METHOD0(ReleaseShaderCompiler, void());
 
   MOCK_METHOD4(RenderbufferStorageEXT, void(
       GLenum target, GLenum internalformat, GLsizei width, GLsizei height));
 
   MOCK_METHOD5(RenderbufferStorageMultisampleANGLE, void(
@@ skipping 150 matching lines @@
 
   MOCK_METHOD1(SetSurfaceCHROMIUM, void(GLuint));
 
   MOCK_METHOD0(GetGraphicsResetStatusARB, GLenum());
 };
 
 }  // namespace gfx
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_