Port content::GLHelper over to GLES2Interface

This is necessary to remove the WebGraphicsContext3D getter from
cc::ContextProvider.

TBR=maruel@ for trivial PRESUBMIT.py change
BUG=181120

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243499 0039d316-1c4b-4281-b951-d872f2087c98

PRESUBMIT.py

@@ -897,6 +897,8 @@ def _CheckSpamLogging(input_api, output_api):
                  r"^chrome[\\\/]installer[\\\/]setup[\\\/].*",
                  r"^chrome[\\\/]renderer[\\\/]extensions[\\\/]"
                      r"logging_native_handler\.cc$",
+                 r"^content[\\\/]common[\\\/]gpu[\\\/]client[\\\/]"
+                     r"gl_helper_benchmark\.cc$",
                  r"^remoting[\\\/]base[\\\/]logging\.h$",
                  r"^remoting[\\\/]host[\\\/].*",
                  r"^sandbox[\\\/]linux[\\\/].*",

content/browser/aura/gpu_process_transport_factory.cc

@@ -338,7 +338,7 @@ GLHelper* GpuProcessTransportFactory::GetGLHelper() {
     scoped_refptr<cc::ContextProvider> provider =
         SharedMainThreadContextProvider();
     if (provider.get())
-      gl_helper_.reset(new GLHelper(provider->Context3d(),
+      gl_helper_.reset(new GLHelper(provider->ContextGL(),
                                     provider->ContextSupport()));
   }
   return gl_helper_.get();

content/browser/aura/no_transport_image_transport_factory.cc

@@ -77,7 +77,7 @@ scoped_refptr<ui::Texture> NoTransportImageTransportFactory::CreateOwnedTexture(
 GLHelper* NoTransportImageTransportFactory::GetGLHelper() {
   if (!gl_helper_) {
     context_provider_ = context_factory_->SharedMainThreadContextProvider();
-    gl_helper_.reset(new GLHelper(context_provider_->Context3d(),
+    gl_helper_.reset(new GLHelper(context_provider_->ContextGL(),
                                   context_provider_->ContextSupport()));
   }
   return gl_helper_.get();

content/browser/aura/reflector_impl.cc

@@ -88,7 +88,7 @@ void ReflectorImpl::ShutdownOnImplThread() {
 void ReflectorImpl::AttachToOutputSurface(
     BrowserCompositorOutputSurface* output_surface) {
   gl_helper_.reset(
-      new GLHelper(output_surface->context_provider()->Context3d(),
+      new GLHelper(output_surface->context_provider()->ContextGL(),
                    output_surface->context_provider()->ContextSupport()));
   output_surface->SetReflector(this);
 }

content/browser/renderer_host/image_transport_factory_android.cc

@@ -10,6 +10,7 @@
 #include "content/common/gpu/client/gl_helper.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
+#include "gpu/command_buffer/client/gles2_implementation.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/android/device_display_info.h"
@@ -144,7 +145,7 @@ void CmdBufferImageTransportFactory::AcquireTexture(
 
 GLHelper* CmdBufferImageTransportFactory::GetGLHelper() {
   if (!gl_helper_)
-    gl_helper_.reset(new GLHelper(context_.get(),
+    gl_helper_.reset(new GLHelper(context_->GetImplementation(),
                                   context_->GetContextSupport()));
 
   return gl_helper_.get();

content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -2633,7 +2633,7 @@ void RenderWidgetHostViewAura::DidRecreateLayer(ui::Layer *old_layer,
     scoped_refptr<ui::Texture> new_texture;
     if (host_->is_accelerated_compositing_active() &&
         gl_helper && current_surface_.get()) {
-      blink::WebGLId texture_id =
+      GLuint texture_id =
           gl_helper->CopyTexture(current_surface_->PrepareTexture(),
                                  current_surface_->size());
       if (texture_id) {

content/browser/web_contents/touch_editable_impl_aura.h

@@ -7,6 +7,7 @@
 
 #include <deque>
 #include <map>
+#include <queue>
 
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "ui/aura/window_observer.h"

content/common/gpu/client/gl_helper_benchmark.cc

@@ -67,9 +67,10 @@ class GLHelperTest : public testing::Test {
     context_->makeContextCurrent();
 
     helper_.reset(
-        new content::GLHelper(context_.get(), context_->GetContextSupport()));
+        new content::GLHelper(context_->GetGLInterface(),
+                              context_->GetContextSupport()));
     helper_scaling_.reset(new content::GLHelperScaling(
-        context_.get(),
+        context_->GetGLInterface(),
         helper_.get()));
   }
 

content/common/gpu/client/gl_helper_scaling.h

@@ -5,9 +5,13 @@
 #ifndef CONTENT_COMMON_GPU_CLIENT_GL_HELPER_SCALING_H_
 #define CONTENT_COMMON_GPU_CLIENT_GL_HELPER_SCALING_H_
 
+#include <deque>
+#include <map>
 #include <vector>
 
 #include "content/common/gpu/client/gl_helper.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/size.h"
 
 namespace content {
 
@@ -41,13 +45,13 @@ class CONTENT_EXPORT GLHelperScaling {
     virtual ~ShaderInterface() {}
     // Note that the src_texture will have the min/mag filter set to GL_LINEAR
     // and wrap_s/t set to CLAMP_TO_EDGE in this call.
-    virtual void Execute(blink::WebGLId source_texture,
-                         const std::vector<blink::WebGLId>& dest_textures) = 0;
+    virtual void Execute(GLuint source_texture,
+                         const std::vector<GLuint>& dest_textures) = 0;
   };
 
   typedef std::pair<ShaderType, bool> ShaderProgramKeyType;
 
-  GLHelperScaling(blink::WebGraphicsContext3D* context,
+  GLHelperScaling(gpu::gles2::GLES2Interface* gl,
                   GLHelper* helper);
   ~GLHelperScaling();
   void InitBuffer();
@@ -182,9 +186,9 @@ class CONTENT_EXPORT GLHelperScaling {
 
   // Interleaved array of 2-dimentional vertex positions (x, y) and
   // 2-dimentional texture coordinates (s, t).
-  static const blink::WGC3Dfloat kVertexAttributes[];
+  static const GLfloat kVertexAttributes[];
 
-  blink::WebGraphicsContext3D* context_;
+  gpu::gles2::GLES2Interface* gl_;
   GLHelper* helper_;
 
   // The buffer that holds the vertices and the texture coordinates data for