Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

ui/gl/gl_bindings_skia_in_process.cc

 // Copyright (c) 2012 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.
 
 
 #include "ui/gl/gl_bindings_skia_in_process.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/gpu/gl/GrGLInterface.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 211 matching lines @@
 }
 
 GLvoid StubGLFinish() {
   glFinish();
 }
 
 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) {
   glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget,
                                renderbuffer);
 }
 
 GLvoid StubGLFramebufferTexture2D(GLenum target, GLenum attachment,
                                   GLenum textarget, GLuint texture,
                                   GLint level) {
@@ skipping 82 matching lines @@
 
 GLvoid StubGLGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype,
                                       GLint *range, GLint *precision) {
   glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision);
 }
 
 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);
 }
 
 GLvoid StubGLGetQueryObjecti64v(GLuint id, GLenum pname, GLint64* params) {
   glGetQueryObjecti64v(id, pname, params);
 }
 
 GLvoid StubGLGetQueryObjectiv(GLuint id, GLenum pname, GLint* params) {
   glGetQueryObjectiv(id, pname, params);
@@ skipping 13 matching lines @@
 }
 
 GLint StubGLGetUniformLocation(GLuint program, const char* name) {
   return glGetUniformLocation(program, name);
 }
 
 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);
 }
 
 GLvoid StubGLLinkProgram(GLuint program) {
   glLinkProgram(program);
 }
 
 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);
 }
 
 GLvoid StubGLPopGroupMarker() {
   glPopGroupMarkerEXT();
 }
 
 GLvoid StubGLPushGroupMarker(GLsizei length, const char* marker) {
   glPushGroupMarkerEXT(length, marker);
@@ skipping 193 matching lines @@
 
 GLvoid StubGLVertexAttribPointer(GLuint indx, GLint size, GLenum type,
                                  GLboolean normalized, GLsizei stride,
                                  const void* ptr) {
   glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
 }
 
 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
 
 namespace gfx {
 
 GrGLInterface* CreateInProcessSkiaGLBinding() {
   GrGLStandard standard;
   switch (gfx::GetGLImplementation()) {
     case gfx::kGLImplementationNone:
       NOTREACHED();
@@ skipping 13 matching lines @@
       return NULL;
     default:
       NOTREACHED();
       return NULL;
   }
 
   GrGLInterface* interface = new GrGLInterface;
   interface->fStandard = standard;
   interface->fExtensions.init(standard,
                               StubGLGetString,
-                              StubGLGetStringi,
+                              NULL,
                               StubGLGetIntegerv);
 
   GrGLInterface::Functions* functions = &interface->fFunctions;
   functions->fActiveTexture = StubGLActiveTexture;
   functions->fAttachShader = StubGLAttachShader;
   functions->fBeginQuery = StubGLBeginQuery;
   functions->fBindAttribLocation = StubGLBindAttribLocation;
   functions->fBindBuffer = StubGLBindBuffer;
   functions->fBindFragDataLocation = StubGLBindFragDataLocation;
   functions->fBindTexture = StubGLBindTexture;
@@ skipping 24 matching lines @@
   functions->fDiscardFramebuffer = StubGLDiscardFramebuffer;
   functions->fDrawArrays = StubGLDrawArrays;
   functions->fDrawBuffer = StubGLDrawBuffer;
   functions->fDrawBuffers = StubGLDrawBuffers;
   functions->fDrawElements = StubGLDrawElements;
   functions->fEnable = StubGLEnable;
   functions->fEnableVertexAttribArray = StubGLEnableVertexAttribArray;
   functions->fEndQuery = StubGLEndQuery;
   functions->fFinish = StubGLFinish;
   functions->fFlush = StubGLFlush;
-  functions->fFlushMappedBufferRange = StubGLFlushMappedBufferRange;
   functions->fFrontFace = StubGLFrontFace;
   functions->fGenBuffers = StubGLGenBuffers;
   functions->fGenQueries = StubGLGenQueries;
   functions->fGenTextures = StubGLGenTextures;
   functions->fGenVertexArrays = StubGLGenVertexArrays;
   functions->fGenerateMipmap = StubGLGenerateMipmap;
   functions->fGetBufferParameteriv = StubGLGetBufferParameteriv;
   functions->fGetError = StubGLGetError;
   functions->fGetIntegerv = StubGLGetIntegerv;
   functions->fGetQueryiv = StubGLGetQueryiv;
   functions->fGetQueryObjecti64v = StubGLGetQueryObjecti64v;
   functions->fGetQueryObjectiv = StubGLGetQueryObjectiv;
   functions->fGetQueryObjectui64v = StubGLGetQueryObjectui64v;
   functions->fGetQueryObjectuiv = StubGLGetQueryObjectuiv;
   functions->fGetProgramInfoLog = StubGLGetProgramInfoLog;
   functions->fGetProgramiv = StubGLGetProgramiv;
   functions->fGetShaderInfoLog = StubGLGetShaderInfoLog;
   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;
   functions->fQueryCounter = StubGLQueryCounter;
   functions->fReadBuffer = StubGLReadBuffer;
   functions->fReadPixels = StubGLReadPixels;
   functions->fScissor = StubGLScissor;
   functions->fShaderSource = StubGLShaderSource;
   functions->fStencilFunc = StubGLStencilFunc;
   functions->fStencilFuncSeparate = StubGLStencilFuncSeparate;
@@ skipping 42 matching lines @@
   functions->fFramebufferTexture2DMultisample =
     StubGLFramebufferTexture2DMultisample;
   functions->fGenFramebuffers = StubGLGenFramebuffers;
   functions->fGenRenderbuffers = StubGLGenRenderbuffers;
   functions->fGetFramebufferAttachmentParameteriv =
     StubGLGetFramebufferAttachmentParameteriv;
   functions->fGetRenderbufferParameteriv = StubGLGetRenderbufferParameteriv;
   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;
 }
 
 }  // namespace gfx