Roll skia to 2303

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 10 matching lines @@
 
   MOCK_METHOD1(ActiveTexture, void(GLenum texture));
 
   MOCK_METHOD2(AttachShader, void(GLuint program, GLuint shader));
 
   MOCK_METHOD3(BindAttribLocation, void(
       GLuint program, GLuint index, const char* name));
 
   MOCK_METHOD2(BindBuffer, void(GLenum target, GLuint buffer));
 
+  MOCK_METHOD3(BindFragDataLocation, void(GLuint program, GLuint colorNumber,
+      const char* name));
+
   MOCK_METHOD4(BindFragDataLocationIndexedARB, void(GLuint program,
       GLuint colorNumber, GLuint index, const char* name));
 
   MOCK_METHOD2(BindFramebufferEXT, void(GLenum target, GLuint framebuffer));
 
   MOCK_METHOD2(BindRenderbufferEXT, void(GLenum target, GLuint renderbuffer));
 
   MOCK_METHOD2(BindTexture, void(GLenum target, GLuint texture));
 
   MOCK_METHOD4(BlendColor, void(
@@ skipping 400 matching lines @@
 
   MOCK_METHOD1(SetSurfaceCHROMIUM, void(GLuint));
 
   MOCK_METHOD0(GetGraphicsResetStatusARB, GLenum());
 };
 
 }  // namespace gfx
 
 #endif  // GPU_COMMAND_BUFFER_COMMON_GL_MOCK_H_