Move simple methods [T-Z] from WebGraphicsContext3D to GLES2Interface.

This removes methods from WebGraphicsContext3D that were simple macro-
based pass-throughs to the underlying GLES2Interface, and changes
callers in blink to use the GLES2Interface for them instead.

This is ~the last of the OpenGLES 2.0 methods that are simple pass-
throughs.

R=bajones@chromium.org, kbr@chromium.org, piman@chromium.org
TBR=pfeldman
BUG=584497
CQ_INCLUDE_TRYBOTS=tryserver.chromium.win:win_optional_gpu_tests_rel

Review URL: https://codereview.chromium.org/1815803003

Cr-Commit-Position: refs/heads/master@{#382174}

2 files changed, 0 insertions, 504 deletions

diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
index 89716ec..30030b2a 100644
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ b/gpu/blink/webgraphicscontext3d_impl.cc
@@ -406,95 +406,6 @@ void WebGraphicsContext3DImpl::shaderSource(
   gl_->ShaderSource(shader, 1, &string, &length);
 }
 
-DELEGATE_TO_GL_9(texImage2D, TexImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei,
-                 WGC3Dint, WGC3Denum, WGC3Denum, const void*)
-
-DELEGATE_TO_GL_3(texParameterf, TexParameterf,
-                 WGC3Denum, WGC3Denum, WGC3Dfloat);
-
-DELEGATE_TO_GL_3(texParameteri, TexParameteri,
-                 WGC3Denum, WGC3Denum, WGC3Dint);
-
-DELEGATE_TO_GL_9(texSubImage2D, TexSubImage2D,
-                 WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dsizei,
-                 WGC3Dsizei, WGC3Denum, WGC3Denum, const void*)
-
-DELEGATE_TO_GL_2(uniform1f, Uniform1f, WGC3Dint, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform1fv, Uniform1fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_2(uniform1i, Uniform1i, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform1iv, Uniform1iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_3(uniform2f, Uniform2f, WGC3Dint, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform2fv, Uniform2fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(uniform2i, Uniform2i, WGC3Dint, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform2iv, Uniform2iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_4(uniform3f, Uniform3f, WGC3Dint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform3fv, Uniform3fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(uniform3i, Uniform3i, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform3iv, Uniform3iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_5(uniform4f, Uniform4f, WGC3Dint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_3(uniform4fv, Uniform4fv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_5(uniform4i, Uniform4i, WGC3Dint,
-                 WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint)
-
-DELEGATE_TO_GL_3(uniform4iv, Uniform4iv, WGC3Dint, WGC3Dsizei, const WGC3Dint*)
-
-DELEGATE_TO_GL_4(uniformMatrix2fv, UniformMatrix2fv,
-                 WGC3Dint, WGC3Dsizei, WGC3Dboolean, const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(uniformMatrix3fv, UniformMatrix3fv,
-                 WGC3Dint, WGC3Dsizei, WGC3Dboolean, const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(uniformMatrix4fv, UniformMatrix4fv,
-                 WGC3Dint, WGC3Dsizei, WGC3Dboolean, const WGC3Dfloat*)
-
-DELEGATE_TO_GL_1(useProgram, UseProgram, WebGLId)
-
-DELEGATE_TO_GL_1(validateProgram, ValidateProgram, WebGLId)
-
-DELEGATE_TO_GL_2(vertexAttrib1f, VertexAttrib1f, WGC3Duint, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib1fv, VertexAttrib1fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(vertexAttrib2f, VertexAttrib2f, WGC3Duint,
-                 WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib2fv, VertexAttrib2fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(vertexAttrib3f, VertexAttrib3f, WGC3Duint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib3fv, VertexAttrib3fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
-DELEGATE_TO_GL_5(vertexAttrib4f, VertexAttrib4f, WGC3Duint,
-                 WGC3Dfloat, WGC3Dfloat, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_2(vertexAttrib4fv, VertexAttrib4fv, WGC3Duint,
-                 const WGC3Dfloat*)
-
 void WebGraphicsContext3DImpl::vertexAttribPointer(
     WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dboolean normalized,
     WGC3Dsizei stride, WGC3Dintptr offset) {
@@ -503,9 +414,6 @@ void WebGraphicsContext3DImpl::vertexAttribPointer(
       reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
 }
 
-DELEGATE_TO_GL_4(viewport, Viewport,
-                 WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei)
-
 WebGLId WebGraphicsContext3DImpl::createBuffer() {
   GLuint o;
   gl_->GenBuffers(1, &o);
@@ -548,14 +456,6 @@ void WebGraphicsContext3DImpl::deleteTexture(WebGLId texture) {
   gl_->DeleteTextures(1, &texture);
 }
 
-DELEGATE_TO_GL_R(createProgram, CreateProgram, WebGLId)
-
-DELEGATE_TO_GL_1R(createShader, CreateShader, WGC3Denum, WebGLId)
-
-DELEGATE_TO_GL_1(deleteProgram, DeleteProgram, WebGLId)
-
-DELEGATE_TO_GL_1(deleteShader, DeleteShader, WebGLId)
-
 void WebGraphicsContext3DImpl::setErrorMessageCallback(
     WebGraphicsContext3D::WebGraphicsErrorMessageCallback* cb) {
   error_message_callback_ = cb;
@@ -566,9 +466,6 @@ void WebGraphicsContext3DImpl::setContextLostCallback(
   context_lost_callback_ = cb;
 }
 
-DELEGATE_TO_GL_5(texStorage2DEXT, TexStorage2DEXT,
-                 WGC3Denum, WGC3Dint, WGC3Duint, WGC3Dint, WGC3Dint)
-
 WebGLId WebGraphicsContext3DImpl::createQueryEXT() {
   GLuint o;
   gl_->GenQueriesEXT(1, &o);
@@ -586,32 +483,10 @@ WebGLId WebGraphicsContext3DImpl::createValuebufferCHROMIUM() {
   return o;
 }
 
-DELEGATE_TO_GL_2(deleteValuebuffersCHROMIUM,
-                 DeleteValuebuffersCHROMIUM,
-                 WGC3Dsizei,
-                 WebGLId*);
-
 void WebGraphicsContext3DImpl::deleteValuebufferCHROMIUM(WebGLId valuebuffer) {
   gl_->DeleteValuebuffersCHROMIUM(1, &valuebuffer);
 }
 
-DELEGATE_TO_GL_2(bindValuebufferCHROMIUM,
-                 BindValuebufferCHROMIUM,
-                 WGC3Denum,
-                 WebGLId)
-DELEGATE_TO_GL_2(subscribeValueCHROMIUM,
-                 SubscribeValueCHROMIUM,
-                 WGC3Denum,
-                 WGC3Denum);
-DELEGATE_TO_GL_1(populateSubscribedValuesCHROMIUM,
-                 PopulateSubscribedValuesCHROMIUM,
-                 WGC3Denum);
-DELEGATE_TO_GL_3(uniformValuebufferCHROMIUM,
-                 UniformValuebufferCHROMIUM,
-                 WGC3Dint,
-                 WGC3Denum,
-                 WGC3Denum);
-
 void WebGraphicsContext3DImpl::pushGroupMarkerEXT(
     const WGC3Dchar* marker) {
   gl_->PushGroupMarkerEXT(0, marker);
@@ -628,51 +503,6 @@ void WebGraphicsContext3DImpl::deleteVertexArrayOES(
   gl_->DeleteVertexArraysOES(1, &array);
 }
 
-DELEGATE_TO_GL_1R(isVertexArrayOES, IsVertexArrayOES, WebGLId, WGC3Dboolean)
-DELEGATE_TO_GL_1(bindVertexArrayOES, BindVertexArrayOES, WebGLId)
-
-DELEGATE_TO_GL_2(bindTexImage2DCHROMIUM, BindTexImage2DCHROMIUM,
-                 WGC3Denum, WGC3Dint)
-DELEGATE_TO_GL_2(releaseTexImage2DCHROMIUM, ReleaseTexImage2DCHROMIUM,
-                 WGC3Denum, WGC3Dint)
-
-DELEGATE_TO_GL_2(drawBuffersEXT, DrawBuffersEXT, WGC3Dsizei, const WGC3Denum*)
-
-DELEGATE_TO_GL_4(drawArraysInstancedANGLE, DrawArraysInstancedANGLE, WGC3Denum,
-                 WGC3Dint, WGC3Dsizei, WGC3Dsizei)
-
-void WebGraphicsContext3DImpl::drawElementsInstancedANGLE(
-    WGC3Denum mode,
-    WGC3Dsizei count,
-    WGC3Denum type,
-    WGC3Dintptr offset,
-    WGC3Dsizei primcount) {
-  gl_->DrawElementsInstancedANGLE(
-      mode, count, type,
-      reinterpret_cast<void*>(static_cast<intptr_t>(offset)), primcount);
-}
-
-DELEGATE_TO_GL_2(vertexAttribDivisorANGLE, VertexAttribDivisorANGLE, WGC3Duint,
-                 WGC3Duint)
-
-DELEGATE_TO_GL_4R(createGpuMemoryBufferImageCHROMIUM,
-                  CreateGpuMemoryBufferImageCHROMIUM,
-                  WGC3Dsizei,
-                  WGC3Dsizei,
-                  WGC3Denum,
-                  WGC3Denum,
-                  WGC3Duint);
-
-DELEGATE_TO_GL_1(destroyImageCHROMIUM, DestroyImageCHROMIUM, WGC3Duint);
-
-DELEGATE_TO_GL_6(framebufferTexture2DMultisampleEXT,
-                 FramebufferTexture2DMultisampleEXT,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WebGLId, WGC3Dint, WGC3Dsizei)
-
-DELEGATE_TO_GL_5(renderbufferStorageMultisampleEXT,
-                 RenderbufferStorageMultisampleEXT, WGC3Denum, WGC3Dsizei,
-                 WGC3Denum, WGC3Dsizei, WGC3Dsizei)
-
 DELEGATE_TO_GL_1(beginTransformFeedback, BeginTransformFeedback, WGC3Denum)
 DELEGATE_TO_GL_3(bindBufferBase, BindBufferBase, WGC3Denum, WGC3Duint,
                  WGC3Duint)
@@ -758,10 +588,6 @@ DELEGATE_TO_GL_4(getUniformIndices, GetUniformIndices, WGC3Duint, WGC3Dsizei,
                  const WGC3Dchar *const*, WGC3Duint *)
 DELEGATE_TO_GL_3(getUniformuiv, GetUniformuiv, WGC3Duint, WGC3Dint,
                  WGC3Duint *)
-DELEGATE_TO_GL_3(getVertexAttribIiv, GetVertexAttribIiv, WGC3Duint,
-                 WGC3Denum, WGC3Dint *)
-DELEGATE_TO_GL_3(getVertexAttribIuiv, GetVertexAttribIuiv, WGC3Duint,
-                 WGC3Denum, WGC3Duint *)
 DELEGATE_TO_GL_3(invalidateFramebuffer, InvalidateFramebuffer, WGC3Denum,
                  WGC3Dsizei, const WGC3Denum *)
 DELEGATE_TO_GL_7(invalidateSubFramebuffer, InvalidateSubFramebuffer, WGC3Denum,
@@ -788,53 +614,9 @@ DELEGATE_TO_GL_3(samplerParameteri, SamplerParameteri, WGC3Duint, WGC3Denum,
                  WGC3Dint)
 DELEGATE_TO_GL_3(samplerParameteriv, SamplerParameteriv, WGC3Duint, WGC3Denum,
                  const WGC3Dint *)
-DELEGATE_TO_GL_10(texImage3D, TexImage3D, WGC3Denum, WGC3Dint, WGC3Dint,
-                  WGC3Dsizei, WGC3Dsizei, WGC3Dsizei, WGC3Dint, WGC3Denum,
-                  WGC3Denum, const void *)
-DELEGATE_TO_GL_6(texStorage3D, TexStorage3D, WGC3Denum, WGC3Dsizei, WGC3Denum,
-                 WGC3Dsizei, WGC3Dsizei, WGC3Dsizei)
-DELEGATE_TO_GL_11(texSubImage3D, TexSubImage3D, WGC3Denum, WGC3Dint, WGC3Dint,
-                  WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei, WGC3Dsizei,
-                  WGC3Denum, WGC3Denum, const void *)
 DELEGATE_TO_GL_4(transformFeedbackVaryings, TransformFeedbackVaryings,
                  WGC3Duint, WGC3Dsizei, const WGC3Dchar *const*, WGC3Denum)
-DELEGATE_TO_GL_2(uniform1ui, Uniform1ui, WGC3Dint, WGC3Duint)
-DELEGATE_TO_GL_3(uniform1uiv, Uniform1uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_3(uniform2ui, Uniform2ui, WGC3Dint, WGC3Duint, WGC3Duint)
-DELEGATE_TO_GL_3(uniform2uiv, Uniform2uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_4(uniform3ui, Uniform3ui, WGC3Dint, WGC3Duint, WGC3Duint,
-                 WGC3Duint)
-DELEGATE_TO_GL_3(uniform3uiv, Uniform3uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_5(uniform4ui, Uniform4ui, WGC3Dint, WGC3Duint, WGC3Duint,
-                 WGC3Duint, WGC3Duint)
-DELEGATE_TO_GL_3(uniform4uiv, Uniform4uiv, WGC3Dint, WGC3Dsizei,
-                 const WGC3Duint *)
-DELEGATE_TO_GL_3(uniformBlockBinding, UniformBlockBinding, WGC3Duint, WGC3Duint,
-                 WGC3Duint)
-DELEGATE_TO_GL_4(uniformMatrix2x3fv, UniformMatrix2x3fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix2x4fv, UniformMatrix2x4fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix3x2fv, UniformMatrix3x2fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix3x4fv, UniformMatrix3x4fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix4x2fv, UniformMatrix4x2fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
-DELEGATE_TO_GL_4(uniformMatrix4x3fv, UniformMatrix4x3fv, WGC3Dint, WGC3Dsizei,
-                 WGC3Dboolean, const WGC3Dfloat*)
 DELEGATE_TO_GL_1R(unmapBuffer, UnmapBuffer, WGC3Denum, WGC3Dboolean);
-DELEGATE_TO_GL_5(vertexAttribI4i, VertexAttribI4i, WGC3Duint, WGC3Dint,
-                 WGC3Dint, WGC3Dint, WGC3Dint)
-DELEGATE_TO_GL_2(vertexAttribI4iv, VertexAttribI4iv, WGC3Duint,
-                 const WGC3Dint *)
-DELEGATE_TO_GL_5(vertexAttribI4ui, VertexAttribI4ui, WGC3Duint, WGC3Duint,
-                 WGC3Duint, WGC3Duint, WGC3Duint)
-DELEGATE_TO_GL_2(vertexAttribI4uiv, VertexAttribI4uiv, WGC3Duint,
-                 const WGC3Duint *)
 void WebGraphicsContext3DImpl::vertexAttribIPointer(
     WGC3Duint index, WGC3Dint size, WGC3Denum type, WGC3Dsizei stride,
     WGC3Dintptr offset) {
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index acce68c..fa91328 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -70,120 +70,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   void shaderSource(blink::WebGLId shader,
                     const blink::WGC3Dchar* string) override;
 
-  void texImage2D(blink::WGC3Denum target,
-                  blink::WGC3Dint level,
-                  blink::WGC3Denum internalformat,
-                  blink::WGC3Dsizei width,
-                  blink::WGC3Dsizei height,
-                  blink::WGC3Dint border,
-                  blink::WGC3Denum format,
-                  blink::WGC3Denum type,
-                  const void* pixels) override;
-
-  void texParameterf(blink::WGC3Denum target,
-                     blink::WGC3Denum pname,
-                     blink::WGC3Dfloat param) override;
-  void texParameteri(blink::WGC3Denum target,
-                     blink::WGC3Denum pname,
-                     blink::WGC3Dint param) override;
-
-  void texSubImage2D(blink::WGC3Denum target,
-                     blink::WGC3Dint level,
-                     blink::WGC3Dint xoffset,
-                     blink::WGC3Dint yoffset,
-                     blink::WGC3Dsizei width,
-                     blink::WGC3Dsizei height,
-                     blink::WGC3Denum format,
-                     blink::WGC3Denum type,
-                     const void* pixels) override;
-
-  void uniform1f(blink::WGC3Dint location, blink::WGC3Dfloat x) override;
-  void uniform1fv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dfloat* v) override;
-  void uniform1i(blink::WGC3Dint location, blink::WGC3Dint x) override;
-  void uniform1iv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dint* v) override;
-  void uniform2f(blink::WGC3Dint location,
-                 blink::WGC3Dfloat x,
-                 blink::WGC3Dfloat y) override;
-  void uniform2fv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dfloat* v) override;
-  void uniform2i(blink::WGC3Dint location,
-                 blink::WGC3Dint x,
-                 blink::WGC3Dint y) override;
-  void uniform2iv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dint* v) override;
-  void uniform3f(blink::WGC3Dint location,
-                 blink::WGC3Dfloat x,
-                 blink::WGC3Dfloat y,
-                 blink::WGC3Dfloat z) override;
-  void uniform3fv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dfloat* v) override;
-  void uniform3i(blink::WGC3Dint location,
-                 blink::WGC3Dint x,
-                 blink::WGC3Dint y,
-                 blink::WGC3Dint z) override;
-  void uniform3iv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dint* v) override;
-  void uniform4f(blink::WGC3Dint location,
-                 blink::WGC3Dfloat x,
-                 blink::WGC3Dfloat y,
-                 blink::WGC3Dfloat z,
-                 blink::WGC3Dfloat w) override;
-  void uniform4fv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dfloat* v) override;
-  void uniform4i(blink::WGC3Dint location,
-                 blink::WGC3Dint x,
-                 blink::WGC3Dint y,
-                 blink::WGC3Dint z,
-                 blink::WGC3Dint w) override;
-  void uniform4iv(blink::WGC3Dint location,
-                  blink::WGC3Dsizei count,
-                  const blink::WGC3Dint* v) override;
-  void uniformMatrix2fv(blink::WGC3Dint location,
-                        blink::WGC3Dsizei count,
-                        blink::WGC3Dboolean transpose,
-                        const blink::WGC3Dfloat* value) override;
-  void uniformMatrix3fv(blink::WGC3Dint location,
-                        blink::WGC3Dsizei count,
-                        blink::WGC3Dboolean transpose,
-                        const blink::WGC3Dfloat* value) override;
-  void uniformMatrix4fv(blink::WGC3Dint location,
-                        blink::WGC3Dsizei count,
-                        blink::WGC3Dboolean transpose,
-                        const blink::WGC3Dfloat* value) override;
-
-  void useProgram(blink::WebGLId program) override;
-  void validateProgram(blink::WebGLId program) override;
-
-  void vertexAttrib1f(blink::WGC3Duint index, blink::WGC3Dfloat x) override;
-  void vertexAttrib1fv(blink::WGC3Duint index,
-                       const blink::WGC3Dfloat* values) override;
-  void vertexAttrib2f(blink::WGC3Duint index,
-                      blink::WGC3Dfloat x,
-                      blink::WGC3Dfloat y) override;
-  void vertexAttrib2fv(blink::WGC3Duint index,
-                       const blink::WGC3Dfloat* values) override;
-  void vertexAttrib3f(blink::WGC3Duint index,
-                      blink::WGC3Dfloat x,
-                      blink::WGC3Dfloat y,
-                      blink::WGC3Dfloat z) override;
-  void vertexAttrib3fv(blink::WGC3Duint index,
-                       const blink::WGC3Dfloat* values) override;
-  void vertexAttrib4f(blink::WGC3Duint index,
-                      blink::WGC3Dfloat x,
-                      blink::WGC3Dfloat y,
-                      blink::WGC3Dfloat z,
-                      blink::WGC3Dfloat w) override;
-  void vertexAttrib4fv(blink::WGC3Duint index,
-                       const blink::WGC3Dfloat* values) override;
   void vertexAttribPointer(blink::WGC3Duint index,
                            blink::WGC3Dint size,
                            blink::WGC3Denum type,
@@ -191,11 +77,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                            blink::WGC3Dsizei stride,
                            blink::WGC3Dintptr offset) override;
 
-  void viewport(blink::WGC3Dint x,
-                blink::WGC3Dint y,
-                blink::WGC3Dsizei width,
-                blink::WGC3Dsizei height) override;
-
   blink::WebGLId createBuffer() override;
   blink::WebGLId createFramebuffer() override;
   blink::WebGLId createRenderbuffer() override;
@@ -206,12 +87,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   void deleteRenderbuffer(blink::WebGLId) override;
   void deleteTexture(blink::WebGLId) override;
 
-  blink::WebGLId createProgram() override;
-  blink::WebGLId createShader(blink::WGC3Denum) override;
-
-  void deleteProgram(blink::WebGLId) override;
-  void deleteShader(blink::WebGLId) override;
-
   void synthesizeGLError(blink::WGC3Denum) override;
 
   blink::WebString getRequestableExtensionsCHROMIUM() override;
@@ -235,79 +110,17 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   void setErrorMessageCallback(
       WebGraphicsContext3D::WebGraphicsErrorMessageCallback* callback) override;
 
-  void texStorage2DEXT(blink::WGC3Denum target,
-                       blink::WGC3Dint levels,
-                       blink::WGC3Duint internalformat,
-                       blink::WGC3Dint width,
-                       blink::WGC3Dint height) override;
-
   blink::WebGLId createQueryEXT() override;
   void deleteQueryEXT(blink::WebGLId query) override;
 
   blink::WebGLId createValuebufferCHROMIUM() override;
-  void deleteValuebuffersCHROMIUM(blink::WGC3Dsizei count,
-                                  blink::WebGLId* ids) override;
   void deleteValuebufferCHROMIUM(blink::WebGLId) override;
-  void bindValuebufferCHROMIUM(blink::WGC3Denum target,
-                               blink::WebGLId valuebuffer) override;
-  void subscribeValueCHROMIUM(blink::WGC3Denum target,
-                              blink::WGC3Denum subscription) override;
-  void populateSubscribedValuesCHROMIUM(blink::WGC3Denum target) override;
-  void uniformValuebufferCHROMIUM(blink::WGC3Dint location,
-                                  blink::WGC3Denum target,
-                                  blink::WGC3Denum subscription) override;
 
   void pushGroupMarkerEXT(const blink::WGC3Dchar* marker) override;
 
   // GL_OES_vertex_array_object
   blink::WebGLId createVertexArrayOES() override;
   void deleteVertexArrayOES(blink::WebGLId array) override;
-  blink::WGC3Dboolean isVertexArrayOES(blink::WebGLId array) override;
-  void bindVertexArrayOES(blink::WebGLId array) override;
-
-  void bindTexImage2DCHROMIUM(blink::WGC3Denum target,
-                              blink::WGC3Dint image_id) override;
-  void releaseTexImage2DCHROMIUM(blink::WGC3Denum target,
-                                 blink::WGC3Dint image_id) override;
-
-  // GL_EXT_draw_buffers
-  void drawBuffersEXT(blink::WGC3Dsizei n,
-                      const blink::WGC3Denum* bufs) override;
-
-  // GL_ANGLE_instanced_arrays
-  void drawArraysInstancedANGLE(blink::WGC3Denum mode,
-                                blink::WGC3Dint first,
-                                blink::WGC3Dsizei count,
-                                blink::WGC3Dsizei primcount) override;
-  void drawElementsInstancedANGLE(blink::WGC3Denum mode,
-                                  blink::WGC3Dsizei count,
-                                  blink::WGC3Denum type,
-                                  blink::WGC3Dintptr offset,
-                                  blink::WGC3Dsizei primcount) override;
-  void vertexAttribDivisorANGLE(blink::WGC3Duint index,
-                                blink::WGC3Duint divisor) override;
-
-  // GL_CHROMIUM_gpu_memory_buffer_image
-  blink::WGC3Duint createGpuMemoryBufferImageCHROMIUM(
-      blink::WGC3Dsizei width,
-      blink::WGC3Dsizei height,
-      blink::WGC3Denum internalformat,
-      blink::WGC3Denum usage) override;
-  void destroyImageCHROMIUM(blink::WGC3Duint image_id) override;
-
-  // GL_EXT_multisampled_render_to_texture
-  void framebufferTexture2DMultisampleEXT(blink::WGC3Denum target,
-                                          blink::WGC3Denum attachment,
-                                          blink::WGC3Denum textarget,
-                                          blink::WebGLId texture,
-                                          blink::WGC3Dint level,
-                                          blink::WGC3Dsizei samples) override;
-  void renderbufferStorageMultisampleEXT(
-      blink::WGC3Denum target,
-      blink::WGC3Dsizei samples,
-      blink::WGC3Denum internalformat,
-      blink::WGC3Dsizei width,
-      blink::WGC3Dsizei height) override;
 
   // OpenGL ES 3.0 functions not represented by pre-existing extensions
   void beginTransformFeedback(blink::WGC3Denum primitiveMode) override;
@@ -430,12 +243,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   void getUniformuiv(blink::WGC3Duint program,
                      blink::WGC3Dint location,
                      blink::WGC3Duint *params) override;
-  void getVertexAttribIiv(blink::WGC3Duint index,
-                          blink::WGC3Denum pname,
-                          blink::WGC3Dint *params) override;
-  void getVertexAttribIuiv(blink::WGC3Duint index,
-                           blink::WGC3Denum pname,
-                           blink::WGC3Duint *params) override;
   void invalidateFramebuffer(blink::WGC3Denum target,
                              blink::WGC3Dsizei numAttachments,
                              const blink::WGC3Denum* attachments) override;
@@ -471,105 +278,12 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
   void samplerParameteriv(blink::WGC3Duint sampler,
                           blink::WGC3Denum pname,
                           const blink::WGC3Dint* param) override;
-  void texImage3D(blink::WGC3Denum target,
-                  blink::WGC3Dint level,
-                  blink::WGC3Dint internalformat,
-                  blink::WGC3Dsizei width,
-                  blink::WGC3Dsizei height,
-                  blink::WGC3Dsizei depth,
-                  blink::WGC3Dint border,
-                  blink::WGC3Denum format,
-                  blink::WGC3Denum type,
-                  const void* pixels) override;
-  void texStorage3D(blink::WGC3Denum target,
-                    blink::WGC3Dsizei levels,
-                    blink::WGC3Denum internalformat,
-                    blink::WGC3Dsizei width,
-                    blink::WGC3Dsizei height,
-                    blink::WGC3Dsizei depth) override;
-  void texSubImage3D(blink::WGC3Denum target,
-                     blink::WGC3Dint level,
-                     blink::WGC3Dint xoffset,
-                     blink::WGC3Dint yoffset,
-                     blink::WGC3Dint zoffset,
-                     blink::WGC3Dsizei width,
-                     blink::WGC3Dsizei height,
-                     blink::WGC3Dsizei depth,
-                     blink::WGC3Denum format,
-                     blink::WGC3Denum type,
-                     const void* pixels) override;
   void transformFeedbackVaryings(
       blink::WGC3Duint program,
       blink::WGC3Dsizei count,
       const blink::WGC3Dchar* const* varyings,
       blink::WGC3Denum bufferMode) override;
-  void uniform1ui(blink::WGC3Dint location, blink::WGC3Duint x) override;
-  void uniform1uiv(blink::WGC3Dint location,
-                   blink::WGC3Dsizei count,
-                   const blink::WGC3Duint* value) override;
-  void uniform2ui(blink::WGC3Dint location,
-                  blink::WGC3Duint x,
-                  blink::WGC3Duint y) override;
-  void uniform2uiv(blink::WGC3Dint location,
-                   blink::WGC3Dsizei count,
-                   const blink::WGC3Duint* value) override;
-  void uniform3ui(blink::WGC3Dint location,
-                  blink::WGC3Duint x,
-                  blink::WGC3Duint y,
-                  blink::WGC3Duint z) override;
-  void uniform3uiv(blink::WGC3Dint location,
-                   blink::WGC3Dsizei count,
-                   const blink::WGC3Duint* value) override;
-  void uniform4ui(blink::WGC3Dint location,
-                  blink::WGC3Duint x,
-                  blink::WGC3Duint y,
-                  blink::WGC3Duint z,
-                  blink::WGC3Duint w) override;
-  void uniform4uiv(blink::WGC3Dint location,
-                   blink::WGC3Dsizei count,
-                   const blink::WGC3Duint* value) override;
-  void uniformBlockBinding(blink::WGC3Duint program,
-                           blink::WGC3Duint uniformBlockIndex,
-                           blink::WGC3Duint uniformBlockBinding) override;
-  void uniformMatrix2x3fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          blink::WGC3Dboolean transpose,
-                          const blink::WGC3Dfloat* value) override;
-  void uniformMatrix2x4fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          blink::WGC3Dboolean transpose,
-                          const blink::WGC3Dfloat* value) override;
-  void uniformMatrix3x2fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          blink::WGC3Dboolean transpose,
-                          const blink::WGC3Dfloat* value) override;
-  void uniformMatrix3x4fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          blink::WGC3Dboolean transpose,
-                          const blink::WGC3Dfloat* value) override;
-  void uniformMatrix4x2fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          blink::WGC3Dboolean transpose,
-                          const blink::WGC3Dfloat* value) override;
-  void uniformMatrix4x3fv(blink::WGC3Dint location,
-                          blink::WGC3Dsizei count,
-                          blink::WGC3Dboolean transpose,
-                          const blink::WGC3Dfloat* value) override;
   blink::WGC3Dboolean unmapBuffer(blink::WGC3Denum target) override;
-  void vertexAttribI4i(blink::WGC3Duint index,
-                       blink::WGC3Dint x,
-                       blink::WGC3Dint y,
-                       blink::WGC3Dint z,
-                       blink::WGC3Dint w) override;
-  void vertexAttribI4iv(blink::WGC3Duint index,
-                        const blink::WGC3Dint* v) override;
-  void vertexAttribI4ui(blink::WGC3Duint index,
-                        blink::WGC3Duint x,
-                        blink::WGC3Duint y,
-                        blink::WGC3Duint z,
-                        blink::WGC3Duint w) override;
-  void vertexAttribI4uiv(blink::WGC3Duint index,
-                         const blink::WGC3Duint* v) override;
   void vertexAttribIPointer(blink::WGC3Duint index,
                             blink::WGC3Dint size,
                             blink::WGC3Denum type,