Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

ui/gl/gl_bindings_skia_in_process.cc

Index: ui/gl/gl_bindings_skia_in_process.cc
diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
index 25dd698efdf994e6ac7d3da24a91e85cba0dcbb8..91d0b0f99bc40077cabed0ea63fee212bd6a104a 100644
--- a/ui/gl/gl_bindings_skia_in_process.cc
+++ b/ui/gl/gl_bindings_skia_in_process.cc
@@ -229,11 +229,6 @@ GLvoid StubGLFlush() {
   glFlush();
 }
 
-GLvoid StubGLFlushMappedBufferRange(GLenum target, GLintptr offset,
-                                    GLsizeiptr length) {
-  glFlushMappedBufferRange(target, offset, length);
-}
-
 GLvoid StubGLFramebufferRenderbuffer(GLenum target, GLenum attachment,
                                      GLenum renderbuffertarget,
                                      GLuint renderbuffer) {
@@ -336,10 +331,6 @@ const GLubyte* StubGLGetString(GLenum name) {
   return glGetString(name);
 }
 
-const GLubyte* StubGLGetStringi(GLenum name, GLuint index) {
-  return glGetStringi(name, index);
-}
-
 GLvoid StubGLGetQueryiv(GLenum target, GLenum pname, GLint* params) {
   glGetQueryiv(target, pname, params);
 }
@@ -373,20 +364,6 @@ GLvoid StubGLInsertEventMarker(GLsizei length, const char* marker) {
   glInsertEventMarkerEXT(length, marker);
 }
 
-GLvoid StubGLInvalidateFramebuffer(GLenum target, GLsizei numAttachments,
-                                   const GLenum* attachments) {
-  glInvalidateFramebuffer(target, numAttachments, attachments);
-}
-
-GLvoid StubGLInvalidateSubFramebuffer(GLenum target,
-                                      GLsizei numAttachments,
-                                      const GLenum* attachments,
-                                      GLint x, GLint y,
-                                      GLsizei width, GLsizei height) {
-  glInvalidateSubFramebuffer(target, numAttachments, attachments,
-                             x, y, width, height);
-}
-
 GLvoid StubGLLineWidth(GLfloat width) {
   glLineWidth(width);
 }
@@ -399,11 +376,6 @@ void* StubGLMapBuffer(GLenum target, GLenum access) {
   return glMapBuffer(target, access);
 }
 
-void* StubGLMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
-                           GLbitfield access) {
-  return glMapBufferRange(target, offset, length, access);
-}
-
 GLvoid StubGLPixelStorei(GLenum pname, GLint param) {
   glPixelStorei(pname, param);
 }
@@ -617,13 +589,6 @@ GLvoid StubGLVertexAttribPointer(GLuint indx, GLint size, GLenum type,
 GLvoid StubGLViewport(GLint x, GLint y, GLsizei width, GLsizei height) {
   glViewport(x, y, width, height);
 }
-
-GLint StubGLGetProgramResourceLocation(GLuint program,
-                                       GLenum programInterface,
-                                       const char* name) {
-  return glGetProgramResourceLocation(program, programInterface, name);
-}
-
 }  // extern "C"
 }  // namespace
 
@@ -657,7 +622,7 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   interface->fStandard = standard;
   interface->fExtensions.init(standard,
                               StubGLGetString,
-                              StubGLGetStringi,
+                              NULL,
                               StubGLGetIntegerv);
 
   GrGLInterface::Functions* functions = &interface->fFunctions;
@@ -702,7 +667,6 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   functions->fEndQuery = StubGLEndQuery;
   functions->fFinish = StubGLFinish;
   functions->fFlush = StubGLFlush;
-  functions->fFlushMappedBufferRange = StubGLFlushMappedBufferRange;
   functions->fFrontFace = StubGLFrontFace;
   functions->fGenBuffers = StubGLGenBuffers;
   functions->fGenQueries = StubGLGenQueries;
@@ -723,15 +687,11 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   functions->fGetShaderiv = StubGLGetShaderiv;
   functions->fGetShaderPrecisionFormat = StubGLGetShaderPrecisionFormat;
   functions->fGetString = StubGLGetString;
-  functions->fGetStringi = StubGLGetStringi;
   functions->fGetTexLevelParameteriv = StubGLGetTexLevelParameteriv;
   functions->fGetUniformLocation = StubGLGetUniformLocation;
   functions->fInsertEventMarker = StubGLInsertEventMarker;
-  functions->fInvalidateFramebuffer = StubGLInvalidateFramebuffer;
-  functions->fInvalidateSubFramebuffer = StubGLInvalidateSubFramebuffer;
   functions->fLineWidth = StubGLLineWidth;
   functions->fLinkProgram = StubGLLinkProgram;
-  functions->fMapBufferRange = StubGLMapBufferRange;
   functions->fPixelStorei = StubGLPixelStorei;
   functions->fPopGroupMarker = StubGLPopGroupMarker;
   functions->fPushGroupMarker = StubGLPushGroupMarker;
@@ -794,14 +754,11 @@ GrGLInterface* CreateInProcessSkiaGLBinding() {
   functions->fRenderbufferStorage = StubGLRenderbufferStorage;
   functions->fRenderbufferStorageMultisample =
     StubGLRenderbufferStorageMultisample;
-  functions->fRenderbufferStorageMultisampleES2EXT =
-    StubGLRenderbufferStorageMultisample;
   functions->fBlitFramebuffer = StubGLBlitFramebuffer;
   functions->fMapBuffer = StubGLMapBuffer;
   functions->fUnmapBuffer = StubGLUnmapBuffer;
   functions->fBindFragDataLocationIndexed =
     StubGLBindFragDataLocationIndexed;
-  functions->fGetProgramResourceLocation = StubGLGetProgramResourceLocation;
 
   return interface;
 }