Roll skia to 2303

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 21 matching lines @@
                                   GLuint index,
                                   const char* name) = 0;
 
   virtual void BindBuffer(GLenum target, GLuint buffer) = 0;
 
   virtual void BindFragDataLocationIndexedARB(GLuint program,
                                               GLuint colorNumber,
                                               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;
 
   virtual void BindTexture(GLenum target, GLuint texture) = 0;
 
   virtual void BlendColor(GLclampf red,
                           GLclampf green,
                           GLclampf blue,
                           GLclampf alpha) = 0;
@@ skipping 501 matching lines @@
 
   virtual GLenum GetGraphicsResetStatusARB() = 0;
 
  private:
   static GLInterface* interface_;
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_GL_GL_INTERFACE_H_