Move simple methods [A-E] from WebGraphicsContext3D to GLES2Interface.

components/test_runner/test_plugin.cc

 // Copyright 2013 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 "components/test_runner/test_plugin.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 225 matching lines @@
     bool is_visible) {
   if (clip_rect == rect_)
     return;
   rect_ = clip_rect;
 
   if (rect_.isEmpty()) {
     texture_mailbox_ = cc::TextureMailbox();
   } else if (context_) {
     context_->viewport(0, 0, rect_.width, rect_.height);
 
-    context_->bindTexture(GL_TEXTURE_2D, color_texture_);
+    gl_->BindTexture(GL_TEXTURE_2D, color_texture_);
     context_->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     context_->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     context_->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     context_->texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     context_->texImage2D(GL_TEXTURE_2D,
                          0,
                          GL_RGBA,
                          rect_.width,
                          rect_.height,
                          0,
                          GL_RGBA,
                          GL_UNSIGNED_BYTE,
                          0);
-    context_->bindFramebuffer(GL_FRAMEBUFFER, framebuffer_);
+    gl_->BindFramebuffer(GL_FRAMEBUFFER, framebuffer_);
     gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D, color_texture_, 0);
 
     DrawSceneGL();
 
     gpu::Mailbox mailbox;
     context_->genMailboxCHROMIUM(mailbox.name);
     context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
-    const blink::WGC3Duint64 fence_sync = context_->insertFenceSyncCHROMIUM();
+    const GLuint64 fence_sync = gl_->InsertFenceSyncCHROMIUM();
     context_->flush();
 
     gpu::SyncToken sync_token;
     context_->genSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
     texture_mailbox_ = cc::TextureMailbox(mailbox, sync_token, GL_TEXTURE_2D);
   } else {
     scoped_ptr<cc::SharedBitmap> bitmap =
         delegate_->GetSharedBitmapManager()->AllocateSharedBitmap(
             gfx::Rect(rect_).size());
     if (!bitmap) {
@@ skipping 89 matching lines @@
   if (!context_)
     return true;
 
   float color[4];
   PremultiplyAlpha(scene_.background_color, scene_.opacity, color);
 
   color_texture_ = context_->createTexture();
   framebuffer_ = context_->createFramebuffer();
 
   context_->viewport(0, 0, rect_.width, rect_.height);
-  context_->disable(GL_DEPTH_TEST);
-  context_->disable(GL_SCISSOR_TEST);
+  gl_->Disable(GL_DEPTH_TEST);
+  gl_->Disable(GL_SCISSOR_TEST);
 
-  context_->clearColor(color[0], color[1], color[2], color[3]);
+  gl_->ClearColor(color[0], color[1], color[2], color[3]);
 
-  context_->enable(GL_BLEND);
-  context_->blendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+  gl_->Enable(GL_BLEND);
+  gl_->BlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
   return scene_.primitive != PrimitiveNone ? InitProgram() && InitPrimitive()
                                            : true;
 }
 
 void TestPlugin::DrawSceneGL() {
   context_->viewport(0, 0, rect_.width, rect_.height);
-  context_->clear(GL_COLOR_BUFFER_BIT);
+  gl_->Clear(GL_COLOR_BUFFER_BIT);
 
   if (scene_.primitive != PrimitiveNone)
     DrawPrimitive();
 }
 
 void TestPlugin::DrawSceneSoftware(void* memory) {
   SkColor background_color = SkColorSetARGB(
       static_cast<uint8_t>(scene_.opacity * 255), scene_.background_color[0],
       scene_.background_color[1], scene_.background_color[2]);
 
@@ skipping 67 matching lines @@
 
 bool TestPlugin::InitPrimitive() {
   DCHECK_EQ(scene_.primitive, PrimitiveTriangle);
 
   scene_.vbo = context_->createBuffer();
   if (!scene_.vbo)
     return false;
 
   const float vertices[] = {0.0f, 0.8f, 0.0f,  -0.8f, -0.8f,
                             0.0f, 0.8f, -0.8f, 0.0f};
-  context_->bindBuffer(GL_ARRAY_BUFFER, scene_.vbo);
-  context_->bufferData(GL_ARRAY_BUFFER, sizeof(vertices), 0, GL_STATIC_DRAW);
-  context_->bufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
+  gl_->BindBuffer(GL_ARRAY_BUFFER, scene_.vbo);
+  gl_->BufferData(GL_ARRAY_BUFFER, sizeof(vertices), 0, GL_STATIC_DRAW);
+  gl_->BufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
   return true;
 }
 
 void TestPlugin::DrawPrimitive() {
   DCHECK_EQ(scene_.primitive, PrimitiveTriangle);
   DCHECK(scene_.vbo);
   DCHECK(scene_.program);
 
   context_->useProgram(scene_.program);
 
   // Bind primitive color.
   float color[4];
   PremultiplyAlpha(scene_.primitive_color, scene_.opacity, color);
   context_->uniform4f(
       scene_.color_location, color[0], color[1], color[2], color[3]);
 
   // Bind primitive vertices.
-  context_->bindBuffer(GL_ARRAY_BUFFER, scene_.vbo);
-  context_->enableVertexAttribArray(scene_.position_location);
+  gl_->BindBuffer(GL_ARRAY_BUFFER, scene_.vbo);
+  gl_->EnableVertexAttribArray(scene_.position_location);
   context_->vertexAttribPointer(
       scene_.position_location, 3, GL_FLOAT, GL_FALSE, 0, 0);
-  context_->drawArrays(GL_TRIANGLES, 0, 3);
+  gl_->DrawArrays(GL_TRIANGLES, 0, 3);
 }
 
 unsigned TestPlugin::LoadShader(unsigned type, const std::string& source) {
   unsigned shader = context_->createShader(type);
   if (shader) {
     context_->shaderSource(shader, source.data());
-    context_->compileShader(shader);
+    gl_->CompileShader(shader);
 
     int compiled = 0;
     context_->getShaderiv(shader, GL_COMPILE_STATUS, &compiled);
     if (!compiled) {
       context_->deleteShader(shader);
       shader = 0;
     }
   }
   return shader;
 }
 
 unsigned TestPlugin::LoadProgram(const std::string& vertex_source,
                                  const std::string& fragment_source) {
   unsigned vertex_shader = LoadShader(GL_VERTEX_SHADER, vertex_source);
   unsigned fragment_shader = LoadShader(GL_FRAGMENT_SHADER, fragment_source);
   unsigned program = context_->createProgram();
   if (vertex_shader && fragment_shader && program) {
-    context_->attachShader(program, vertex_shader);
-    context_->attachShader(program, fragment_shader);
+    gl_->AttachShader(program, vertex_shader);
+    gl_->AttachShader(program, fragment_shader);
     context_->linkProgram(program);
 
     int linked = 0;
     context_->getProgramiv(program, GL_LINK_STATUS, &linked);
     if (!linked) {
       context_->deleteProgram(program);
       program = 0;
     }
   }
   if (vertex_shader)
@@ skipping 190 matching lines @@
   return kPluginPersistsMimeType;
 }
 
 bool TestPlugin::IsSupportedMimeType(const blink::WebString& mime_type) {
   return mime_type == TestPlugin::MimeType() ||
          mime_type == PluginPersistsMimeType() ||
          mime_type == CanCreateWithoutRendererMimeType();
 }
 
 }  // namespace test_runner