Move simple methods [F-S] 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.

R=junov@chromium.org, kbr@chromium.org, piman@chromium.org
TBR=pfeldman
BUG=584497

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

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

2 files changed, 0 insertions, 350 deletions

diff --git a/gpu/blink/webgraphicscontext3d_impl.cc b/gpu/blink/webgraphicscontext3d_impl.cc
index 5d087a2..89716ec 100644
--- a/gpu/blink/webgraphicscontext3d_impl.cc
+++ b/gpu/blink/webgraphicscontext3d_impl.cc
@@ -230,13 +230,6 @@ void WebGraphicsContext3DImpl::drawElements(WGC3Denum mode,
       reinterpret_cast<void*>(static_cast<intptr_t>(offset)));
 }
 
-DELEGATE_TO_GL(finish, Finish)
-DELEGATE_TO_GL(flush, Flush)
-
-DELEGATE_TO_GL_1(frontFace, FrontFace, WGC3Denum)
-
-DELEGATE_TO_GL_1(generateMipmap, GenerateMipmap, WGC3Denum)
-
 bool WebGraphicsContext3DImpl::getActiveAttrib(
     WebGLId program, WGC3Duint index, ActiveInfo& info) {
   if (!program) {
@@ -295,17 +288,6 @@ bool WebGraphicsContext3DImpl::getActiveUniform(
   return true;
 }
 
-DELEGATE_TO_GL_4(getAttachedShaders, GetAttachedShaders,
-                 WebGLId, WGC3Dsizei, WGC3Dsizei*, WebGLId*)
-
-DELEGATE_TO_GL_2R(getAttribLocation, GetAttribLocation,
-                  WebGLId, const WGC3Dchar*, WGC3Dint)
-
-DELEGATE_TO_GL_2(getBooleanv, GetBooleanv, WGC3Denum, WGC3Dboolean*)
-
-DELEGATE_TO_GL_3(getBufferParameteriv, GetBufferParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Dint*)
-
 WGC3Denum WebGraphicsContext3DImpl::getError() {
   if (!synthetic_errors_.empty()) {
     std::vector<WGC3Denum>::iterator iter = synthetic_errors_.begin();
@@ -317,23 +299,6 @@ WGC3Denum WebGraphicsContext3DImpl::getError() {
   return gl_->GetError();
 }
 
-DELEGATE_TO_GL_2(getFloatv, GetFloatv, WGC3Denum, WGC3Dfloat*)
-
-DELEGATE_TO_GL_4(getFramebufferAttachmentParameteriv,
-                 GetFramebufferAttachmentParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_2(getIntegerv, GetIntegerv, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_2(getInteger64v, GetInteger64v, WGC3Denum, WGC3Dint64*)
-
-DELEGATE_TO_GL_3(getIntegeri_v, GetIntegeri_v, WGC3Denum, WGC3Duint, WGC3Dint*)
-
-DELEGATE_TO_GL_3(getInteger64i_v, GetInteger64i_v,
-                 WGC3Denum, WGC3Duint, WGC3Dint64*)
-
-DELEGATE_TO_GL_3(getProgramiv, GetProgramiv, WebGLId, WGC3Denum, WGC3Dint*)
-
 blink::WebString WebGraphicsContext3DImpl::getProgramInfoLog(
     WebGLId program) {
   GLint logLength = 0;
@@ -352,11 +317,6 @@ blink::WebString WebGraphicsContext3DImpl::getProgramInfoLog(
   return res;
 }
 
-DELEGATE_TO_GL_3(getRenderbufferParameteriv, GetRenderbufferParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_3(getShaderiv, GetShaderiv, WebGLId, WGC3Denum, WGC3Dint*)
-
 blink::WebString WebGraphicsContext3DImpl::getShaderInfoLog(
     WebGLId shader) {
   GLint logLength = 0;
@@ -375,9 +335,6 @@ blink::WebString WebGraphicsContext3DImpl::getShaderInfoLog(
   return res;
 }
 
-DELEGATE_TO_GL_4(getShaderPrecisionFormat, GetShaderPrecisionFormat,
-                 WGC3Denum, WGC3Denum, WGC3Dint*, WGC3Dint*)
-
 blink::WebString WebGraphicsContext3DImpl::getShaderSource(
     WebGLId shader) {
   GLint logLength = 0;
@@ -434,25 +391,6 @@ void WebGraphicsContext3DImpl::getSynciv(blink::WGC3Dsync sync,
       reinterpret_cast<GLsync>(sync), pname, bufSize, length, params);
 }
 
-DELEGATE_TO_GL_3(getTexParameterfv, GetTexParameterfv,
-                 WGC3Denum, WGC3Denum, WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(getTexParameteriv, GetTexParameteriv,
-                 WGC3Denum, WGC3Denum, WGC3Dint*)
-
-DELEGATE_TO_GL_3(getUniformfv, GetUniformfv, WebGLId, WGC3Dint, WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(getUniformiv, GetUniformiv, WebGLId, WGC3Dint, WGC3Dint*)
-
-DELEGATE_TO_GL_2R(getUniformLocation, GetUniformLocation,
-                  WebGLId, const WGC3Dchar*, WGC3Dint)
-
-DELEGATE_TO_GL_3(getVertexAttribfv, GetVertexAttribfv,
-                 WGC3Duint, WGC3Denum, WGC3Dfloat*)
-
-DELEGATE_TO_GL_3(getVertexAttribiv, GetVertexAttribiv,
-                 WGC3Duint, WGC3Denum, WGC3Dint*)
-
 WGC3Dsizeiptr WebGraphicsContext3DImpl::getVertexAttribOffset(
     WGC3Duint index, WGC3Denum pname) {
   GLvoid* value = NULL;
@@ -462,63 +400,12 @@ WGC3Dsizeiptr WebGraphicsContext3DImpl::getVertexAttribOffset(
   return static_cast<WGC3Dsizeiptr>(reinterpret_cast<intptr_t>(value));
 }
 
-DELEGATE_TO_GL_2(hint, Hint, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_1RB(isBuffer, IsBuffer, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isEnabled, IsEnabled, WGC3Denum, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isFramebuffer, IsFramebuffer, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isProgram, IsProgram, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isRenderbuffer, IsRenderbuffer, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isShader, IsShader, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1RB(isTexture, IsTexture, WebGLId, WGC3Dboolean)
-
-DELEGATE_TO_GL_1(lineWidth, LineWidth, WGC3Dfloat)
-
-DELEGATE_TO_GL_1(linkProgram, LinkProgram, WebGLId)
-
-DELEGATE_TO_GL_2(pixelStorei, PixelStorei, WGC3Denum, WGC3Dint)
-
-DELEGATE_TO_GL_2(polygonOffset, PolygonOffset, WGC3Dfloat, WGC3Dfloat)
-
-DELEGATE_TO_GL_7(readPixels, ReadPixels,
-                 WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei, WGC3Denum,
-                 WGC3Denum, void*)
-
-DELEGATE_TO_GL_4(renderbufferStorage, RenderbufferStorage,
-                 WGC3Denum, WGC3Denum, WGC3Dsizei, WGC3Dsizei)
-
-DELEGATE_TO_GL_2(sampleCoverage, SampleCoverage, WGC3Dfloat, WGC3Dboolean)
-
-DELEGATE_TO_GL_4(scissor, Scissor, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei)
-
 void WebGraphicsContext3DImpl::shaderSource(
     WebGLId shader, const WGC3Dchar* string) {
   GLint length = strlen(string);
   gl_->ShaderSource(shader, 1, &string, &length);
 }
 
-DELEGATE_TO_GL_3(stencilFunc, StencilFunc, WGC3Denum, WGC3Dint, WGC3Duint)
-
-DELEGATE_TO_GL_4(stencilFuncSeparate, StencilFuncSeparate,
-                 WGC3Denum, WGC3Denum, WGC3Dint, WGC3Duint)
-
-DELEGATE_TO_GL_1(stencilMask, StencilMask, WGC3Duint)
-
-DELEGATE_TO_GL_2(stencilMaskSeparate, StencilMaskSeparate,
-                 WGC3Denum, WGC3Duint)
-
-DELEGATE_TO_GL_3(stencilOp, StencilOp,
-                 WGC3Denum, WGC3Denum, WGC3Denum)
-
-DELEGATE_TO_GL_4(stencilOpSeparate, StencilOpSeparate,
-                 WGC3Denum, WGC3Denum, WGC3Denum, WGC3Denum)
-
 DELEGATE_TO_GL_9(texImage2D, TexImage2D,
                  WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dsizei, WGC3Dsizei,
                  WGC3Dint, WGC3Denum, WGC3Denum, const void*)
@@ -693,58 +580,6 @@ void WebGraphicsContext3DImpl::deleteQueryEXT(
   gl_->DeleteQueriesEXT(1, &query);
 }
 
-DELEGATE_TO_GL_1R(isQueryEXT, IsQueryEXT, WebGLId, WGC3Dboolean)
-DELEGATE_TO_GL_2(beginQueryEXT, BeginQueryEXT, WGC3Denum, WebGLId)
-DELEGATE_TO_GL_1(endQueryEXT, EndQueryEXT, WGC3Denum)
-DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*)
-DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT,
-                 WebGLId, WGC3Denum, WGC3Duint*)
-
-DELEGATE_TO_GL_2(queryCounterEXT, QueryCounterEXT, WebGLId, WGC3Denum)
-DELEGATE_TO_GL_3(getQueryObjectui64vEXT,
-                 GetQueryObjectui64vEXT,
-                 WebGLId,
-                 WGC3Denum,
-                 WGC3Duint64*)
-
-DELEGATE_TO_GL_7(copyTextureCHROMIUM,
-                 CopyTextureCHROMIUM,
-                 WebGLId,
-                 WebGLId,
-                 WGC3Denum,
-                 WGC3Denum,
-                 WGC3Dboolean,
-                 WGC3Dboolean,
-                 WGC3Dboolean);
-
-DELEGATE_TO_GL_11(copySubTextureCHROMIUM,
-                  CopySubTextureCHROMIUM,
-                  WebGLId,
-                  WebGLId,
-                  WGC3Dint,
-                  WGC3Dint,
-                  WGC3Dint,
-                  WGC3Dint,
-                  WGC3Dsizei,
-                  WGC3Dsizei,
-                  WGC3Dboolean,
-                  WGC3Dboolean,
-                  WGC3Dboolean);
-
-DELEGATE_TO_GL_1(genMailboxCHROMIUM, GenMailboxCHROMIUM, WGC3Dbyte*)
-DELEGATE_TO_GL_2(produceTextureCHROMIUM, ProduceTextureCHROMIUM,
-                 WGC3Denum, const WGC3Dbyte*)
-DELEGATE_TO_GL_3(produceTextureDirectCHROMIUM, ProduceTextureDirectCHROMIUM,
-                 WebGLId, WGC3Denum, const WGC3Dbyte*)
-DELEGATE_TO_GL_2R(createAndConsumeTextureCHROMIUM,
-                  CreateAndConsumeTextureCHROMIUM,
-                  WGC3Denum, const WGC3Dbyte*, WebGLId)
-
-DELEGATE_TO_GL_2(genValuebuffersCHROMIUM,
-                 GenValuebuffersCHROMIUM,
-                 WGC3Dsizei,
-                 WebGLId*);
-
 WebGLId WebGraphicsContext3DImpl::createValuebufferCHROMIUM() {
   GLuint o;
   gl_->GenValuebuffersCHROMIUM(1, &o);
@@ -760,10 +595,6 @@ void WebGraphicsContext3DImpl::deleteValuebufferCHROMIUM(WebGLId valuebuffer) {
   gl_->DeleteValuebuffersCHROMIUM(1, &valuebuffer);
 }
 
-DELEGATE_TO_GL_1RB(isValuebufferCHROMIUM,
-                   IsValuebufferCHROMIUM,
-                   WebGLId,
-                   WGC3Dboolean)
 DELEGATE_TO_GL_2(bindValuebufferCHROMIUM,
                  BindValuebufferCHROMIUM,
                  WGC3Denum,
diff --git a/gpu/blink/webgraphicscontext3d_impl.h b/gpu/blink/webgraphicscontext3d_impl.h
index cd423bc..acce68c 100644
--- a/gpu/blink/webgraphicscontext3d_impl.h
+++ b/gpu/blink/webgraphicscontext3d_impl.h
@@ -45,11 +45,6 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                     blink::WGC3Denum type,
                     blink::WGC3Dintptr offset) override;
 
-  void finish() override;
-  void flush() override;
-  void frontFace(blink::WGC3Denum mode) override;
-  void generateMipmap(blink::WGC3Denum target) override;
-
   bool getActiveAttrib(blink::WebGLId program,
                        blink::WGC3Duint index,
                        ActiveInfo&) override;
@@ -57,62 +52,9 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                         blink::WGC3Duint index,
                         ActiveInfo&) override;
 
-  void getAttachedShaders(blink::WebGLId program,
-                          blink::WGC3Dsizei maxCount,
-                          blink::WGC3Dsizei* count,
-                          blink::WebGLId* shaders) override;
-
-  blink::WGC3Dint getAttribLocation(blink::WebGLId program,
-                                    const blink::WGC3Dchar* name) override;
-
-  void getBooleanv(blink::WGC3Denum pname, blink::WGC3Dboolean* value) override;
-
-  void getBufferParameteriv(blink::WGC3Denum target,
-                            blink::WGC3Denum pname,
-                            blink::WGC3Dint* value) override;
-
   blink::WGC3Denum getError() override;
-
-  void getFloatv(blink::WGC3Denum pname, blink::WGC3Dfloat* value) override;
-
-  void getFramebufferAttachmentParameteriv(blink::WGC3Denum target,
-                                           blink::WGC3Denum attachment,
-                                           blink::WGC3Denum pname,
-                                           blink::WGC3Dint* value) override;
-
-  void getIntegerv(blink::WGC3Denum pname, blink::WGC3Dint* value) override;
-
-  void getInteger64v(blink::WGC3Denum pname, blink::WGC3Dint64* value) override;
-
-  void getIntegeri_v(blink::WGC3Denum target,
-                     blink::WGC3Duint index,
-                     blink::WGC3Dint *data) override;
-
-  void getInteger64i_v(blink::WGC3Denum pname,
-                       blink::WGC3Duint index,
-                       blink::WGC3Dint64* value) override;
-
-  void getProgramiv(blink::WebGLId program,
-                    blink::WGC3Denum pname,
-                    blink::WGC3Dint* value) override;
-
   blink::WebString getProgramInfoLog(blink::WebGLId program) override;
-
-  void getRenderbufferParameteriv(blink::WGC3Denum target,
-                                  blink::WGC3Denum pname,
-                                  blink::WGC3Dint* value) override;
-
-  void getShaderiv(blink::WebGLId shader,
-                   blink::WGC3Denum pname,
-                   blink::WGC3Dint* value) override;
-
   blink::WebString getShaderInfoLog(blink::WebGLId shader) override;
-
-  void getShaderPrecisionFormat(blink::WGC3Denum shadertype,
-                                blink::WGC3Denum precisiontype,
-                                blink::WGC3Dint* range,
-                                blink::WGC3Dint* precision) override;
-
   blink::WebString getShaderSource(blink::WebGLId shader) override;
   blink::WebString getString(blink::WGC3Denum name) override;
 
@@ -122,84 +64,11 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
                  blink::WGC3Dsizei *length,
                  blink::WGC3Dint *params) override;
 
-  void getTexParameterfv(blink::WGC3Denum target,
-                         blink::WGC3Denum pname,
-                         blink::WGC3Dfloat* value) override;
-  void getTexParameteriv(blink::WGC3Denum target,
-                         blink::WGC3Denum pname,
-                         blink::WGC3Dint* value) override;
-
-  void getUniformfv(blink::WebGLId program,
-                    blink::WGC3Dint location,
-                    blink::WGC3Dfloat* value) override;
-  void getUniformiv(blink::WebGLId program,
-                    blink::WGC3Dint location,
-                    blink::WGC3Dint* value) override;
-
-  blink::WGC3Dint getUniformLocation(blink::WebGLId program,
-                                     const blink::WGC3Dchar* name) override;
-
-  void getVertexAttribfv(blink::WGC3Duint index,
-                         blink::WGC3Denum pname,
-                         blink::WGC3Dfloat* value) override;
-  void getVertexAttribiv(blink::WGC3Duint index,
-                         blink::WGC3Denum pname,
-                         blink::WGC3Dint* value) override;
-
   blink::WGC3Dsizeiptr getVertexAttribOffset(blink::WGC3Duint index,
                                              blink::WGC3Denum pname) override;
 
-  void hint(blink::WGC3Denum target, blink::WGC3Denum mode) override;
-  blink::WGC3Dboolean isBuffer(blink::WebGLId buffer) override;
-  blink::WGC3Dboolean isEnabled(blink::WGC3Denum cap) override;
-  blink::WGC3Dboolean isFramebuffer(blink::WebGLId framebuffer) override;
-  blink::WGC3Dboolean isProgram(blink::WebGLId program) override;
-  blink::WGC3Dboolean isRenderbuffer(blink::WebGLId renderbuffer) override;
-  blink::WGC3Dboolean isShader(blink::WebGLId shader) override;
-  blink::WGC3Dboolean isTexture(blink::WebGLId texture) override;
-  void lineWidth(blink::WGC3Dfloat) override;
-  void linkProgram(blink::WebGLId program) override;
-  void pixelStorei(blink::WGC3Denum pname, blink::WGC3Dint param) override;
-  void polygonOffset(blink::WGC3Dfloat factor,
-                     blink::WGC3Dfloat units) override;
-
-  void readPixels(blink::WGC3Dint x,
-                  blink::WGC3Dint y,
-                  blink::WGC3Dsizei width,
-                  blink::WGC3Dsizei height,
-                  blink::WGC3Denum format,
-                  blink::WGC3Denum type,
-                  void* pixels) override;
-
-  void renderbufferStorage(blink::WGC3Denum target,
-                           blink::WGC3Denum internalformat,
-                           blink::WGC3Dsizei width,
-                           blink::WGC3Dsizei height) override;
-  void sampleCoverage(blink::WGC3Dfloat value,
-                      blink::WGC3Dboolean invert) override;
-  void scissor(blink::WGC3Dint x,
-               blink::WGC3Dint y,
-               blink::WGC3Dsizei width,
-               blink::WGC3Dsizei height) override;
   void shaderSource(blink::WebGLId shader,
                     const blink::WGC3Dchar* string) override;
-  void stencilFunc(blink::WGC3Denum func,
-                   blink::WGC3Dint ref,
-                   blink::WGC3Duint mask) override;
-  void stencilFuncSeparate(blink::WGC3Denum face,
-                           blink::WGC3Denum func,
-                           blink::WGC3Dint ref,
-                           blink::WGC3Duint mask) override;
-  void stencilMask(blink::WGC3Duint mask) override;
-  void stencilMaskSeparate(blink::WGC3Denum face,
-                           blink::WGC3Duint mask) override;
-  void stencilOp(blink::WGC3Denum fail,
-                 blink::WGC3Denum zfail,
-                 blink::WGC3Denum zpass) override;
-  void stencilOpSeparate(blink::WGC3Denum face,
-                         blink::WGC3Denum fail,
-                         blink::WGC3Denum zfail,
-                         blink::WGC3Denum zpass) override;
 
   void texImage2D(blink::WGC3Denum target,
                   blink::WGC3Dint level,
@@ -374,63 +243,13 @@ class GPU_BLINK_EXPORT WebGraphicsContext3DImpl
 
   blink::WebGLId createQueryEXT() override;
   void deleteQueryEXT(blink::WebGLId query) override;
-  blink::WGC3Dboolean isQueryEXT(blink::WGC3Duint query) override;
-  void beginQueryEXT(blink::WGC3Denum target, blink::WebGLId query) override;
-  void endQueryEXT(blink::WGC3Denum target) override;
-  void getQueryivEXT(blink::WGC3Denum target,
-                     blink::WGC3Denum pname,
-                     blink::WGC3Dint* params) override;
-  void getQueryObjectuivEXT(blink::WebGLId query,
-                            blink::WGC3Denum pname,
-                            blink::WGC3Duint* params) override;
-
-  void queryCounterEXT(blink::WebGLId query, blink::WGC3Denum target) override;
-  void getQueryObjectui64vEXT(blink::WebGLId query,
-                              blink::WGC3Denum pname,
-                              blink::WGC3Duint64* params) override;
-
-  void copyTextureCHROMIUM(
-      blink::WebGLId source_id,
-      blink::WebGLId dest_id,
-      blink::WGC3Denum internal_format,
-      blink::WGC3Denum dest_type,
-      blink::WGC3Dboolean unpack_flip_y,
-      blink::WGC3Dboolean unpack_premultiply_alpha,
-      blink::WGC3Dboolean unpack_unmultiply_alpha) override;
-
-  void copySubTextureCHROMIUM(
-      blink::WebGLId source_id,
-      blink::WebGLId dest_id,
-      blink::WGC3Dint xoffset,
-      blink::WGC3Dint yoffset,
-      blink::WGC3Dint x,
-      blink::WGC3Dint y,
-      blink::WGC3Dsizei width,
-      blink::WGC3Dsizei height,
-      blink::WGC3Dboolean unpack_flip_y,
-      blink::WGC3Dboolean unpack_premultiply_alpha,
-      blink::WGC3Dboolean unpack_unmultiply_alpha) override;
-
-  void genMailboxCHROMIUM(blink::WGC3Dbyte* mailbox) override;
-  void produceTextureCHROMIUM(blink::WGC3Denum target,
-                              const blink::WGC3Dbyte* mailbox) override;
-  void produceTextureDirectCHROMIUM(blink::WebGLId texture,
-                                    blink::WGC3Denum target,
-                                    const blink::WGC3Dbyte* mailbox) override;
-  blink::WebGLId createAndConsumeTextureCHROMIUM(
-      blink::WGC3Denum target,
-      const blink::WGC3Dbyte* mailbox) override;
 
-  void genValuebuffersCHROMIUM(blink::WGC3Dsizei count,
-                               blink::WebGLId* ids) 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;
-  blink::WGC3Dboolean isValuebufferCHROMIUM(
-      blink::WebGLId renderbuffer) override;
   void subscribeValueCHROMIUM(blink::WGC3Denum target,
                               blink::WGC3Denum subscription) override;
   void populateSubscribedValuesCHROMIUM(blink::WGC3Denum target) override;