Move simple methods [F-S] 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 246 matching lines @@
                          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;
-    context_->genMailboxCHROMIUM(mailbox.name);
-    context_->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
+    gl_->GenMailboxCHROMIUM(mailbox.name);
+    gl_->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     const GLuint64 fence_sync = gl_->InsertFenceSyncCHROMIUM();
-    context_->flush();
+    gl_->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) {
       texture_mailbox_ = cc::TextureMailbox();
@@ skipping 175 matching lines @@
       "precision mediump float; \n"
       "uniform vec4 color;      \n"
       "void main() {            \n"
       "  gl_FragColor = color;  \n"
       "}                        \n");
 
   scene_.program = LoadProgram(vertex_source, fragment_source);
   if (!scene_.program)
     return false;
 
-  scene_.color_location = context_->getUniformLocation(scene_.program, "color");
-  scene_.position_location =
-      context_->getAttribLocation(scene_.program, "position");
+  scene_.color_location = gl_->GetUniformLocation(scene_.program, "color");
+  scene_.position_location = gl_->GetAttribLocation(scene_.program, "position");
   return true;
 }
 
 bool TestPlugin::InitPrimitive() {
   DCHECK_EQ(scene_.primitive, PrimitiveTriangle);
 
   scene_.vbo = context_->createBuffer();
   if (!scene_.vbo)
     return false;
 
@@ skipping 26 matching lines @@
   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());
     gl_->CompileShader(shader);
 
     int compiled = 0;
-    context_->getShaderiv(shader, GL_COMPILE_STATUS, &compiled);
+    gl_->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) {
     gl_->AttachShader(program, vertex_shader);
     gl_->AttachShader(program, fragment_shader);
-    context_->linkProgram(program);
+    gl_->LinkProgram(program);
 
     int linked = 0;
-    context_->getProgramiv(program, GL_LINK_STATUS, &linked);
+    gl_->GetProgramiv(program, GL_LINK_STATUS, &linked);
     if (!linked) {
       context_->deleteProgram(program);
       program = 0;
     }
   }
   if (vertex_shader)
     context_->deleteShader(vertex_shader);
   if (fragment_shader)
     context_->deleteShader(fragment_shader);
 
@@ skipping 186 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