Move simple methods [T-Z] 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 223 matching lines @@
     const blink::WebRect& unobscured_rect,
     const blink::WebVector<blink::WebRect>& cut_outs_rects,
     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);
+    gl_->Viewport(0, 0, rect_.width, rect_.height);
 
     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);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    gl_->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    gl_->TexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, rect_.width, rect_.height, 0,
+                    GL_RGBA, GL_UNSIGNED_BYTE, 0);
     gl_->BindFramebuffer(GL_FRAMEBUFFER, framebuffer_);
     gl_->FramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D, color_texture_, 0);
 
     DrawSceneGL();
 
     gpu::Mailbox mailbox;
     gl_->GenMailboxCHROMIUM(mailbox.name);
     gl_->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     const GLuint64 fence_sync = gl_->InsertFenceSyncCHROMIUM();
@@ skipping 98 matching lines @@
 bool TestPlugin::InitScene() {
   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);
+  gl_->Viewport(0, 0, rect_.width, rect_.height);
   gl_->Disable(GL_DEPTH_TEST);
   gl_->Disable(GL_SCISSOR_TEST);
 
   gl_->ClearColor(color[0], color[1], color[2], color[3]);
 
   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);
+  gl_->Viewport(0, 0, rect_.width, rect_.height);
   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 16 matching lines @@
     triangle_path.lineTo(0.9f * rect_.width, 0.1f * rect_.height);
     SkPaint paint;
     paint.setColor(foreground_color);
     paint.setStyle(SkPaint::kFill_Style);
     canvas.drawPath(triangle_path, paint);
   }
 }
 
 void TestPlugin::DestroyScene() {
   if (scene_.program) {
-    context_->deleteProgram(scene_.program);
+    gl_->DeleteProgram(scene_.program);
     scene_.program = 0;
   }
   if (scene_.vbo) {
     context_->deleteBuffer(scene_.vbo);
     scene_.vbo = 0;
   }
 
   if (framebuffer_) {
     context_->deleteFramebuffer(framebuffer_);
     framebuffer_ = 0;
@@ skipping 41 matching lines @@
   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);
+  gl_->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]);
+  gl_->Uniform4f(scene_.color_location, color[0], color[1], color[2], color[3]);
 
   // Bind primitive vertices.
   gl_->BindBuffer(GL_ARRAY_BUFFER, scene_.vbo);
   gl_->EnableVertexAttribArray(scene_.position_location);
   context_->vertexAttribPointer(
       scene_.position_location, 3, GL_FLOAT, GL_FALSE, 0, 0);
   gl_->DrawArrays(GL_TRIANGLES, 0, 3);
 }
 
 unsigned TestPlugin::LoadShader(unsigned type, const std::string& source) {
-  unsigned shader = context_->createShader(type);
+  unsigned shader = gl_->CreateShader(type);
   if (shader) {
     context_->shaderSource(shader, source.data());
     gl_->CompileShader(shader);
 
     int compiled = 0;
     gl_->GetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
     if (!compiled) {
-      context_->deleteShader(shader);
+      gl_->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();
+  unsigned program = gl_->CreateProgram();
   if (vertex_shader && fragment_shader && program) {
     gl_->AttachShader(program, vertex_shader);
     gl_->AttachShader(program, fragment_shader);
     gl_->LinkProgram(program);
 
     int linked = 0;
     gl_->GetProgramiv(program, GL_LINK_STATUS, &linked);
     if (!linked) {
-      context_->deleteProgram(program);
+      gl_->DeleteProgram(program);
       program = 0;
     }
   }
   if (vertex_shader)
-    context_->deleteShader(vertex_shader);
+    gl_->DeleteShader(vertex_shader);
   if (fragment_shader)
-    context_->deleteShader(fragment_shader);
+    gl_->DeleteShader(fragment_shader);
 
   return program;
 }
 
 blink::WebInputEventResult TestPlugin::handleInputEvent(
     const blink::WebInputEvent& event,
     blink::WebCursorInfo& info) {
   const char* event_name = 0;
   switch (event.type) {
     case blink::WebInputEvent::Undefined:
@@ skipping 177 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