Move code in ui/gl/* from gfx:: to gl::

gpu/command_buffer/service/texture_definition.cc

 // Copyright 2014 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 "gpu/command_buffer/service/texture_definition.h"
 
 #include <stdint.h>
 
 #include <list>
 
@@ skipping 136 matching lines @@
     bool needs_wait_before_read;
   };
   std::list<ClientInfo> client_infos_;
   gl::GLImage* write_client_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeImageBufferEGL);
 };
 
 scoped_refptr<NativeImageBufferEGL> NativeImageBufferEGL::Create(
     GLuint texture_id) {
-  EGLDisplay egl_display = gfx::GLSurfaceEGL::GetHardwareDisplay();
+  EGLDisplay egl_display = gl::GLSurfaceEGL::GetHardwareDisplay();
   EGLContext egl_context = eglGetCurrentContext();
 
   DCHECK_NE(EGL_NO_CONTEXT, egl_context);
   DCHECK_NE(EGL_NO_DISPLAY, egl_display);
   DCHECK(glIsTexture(texture_id));
 
-  DCHECK(gfx::g_driver_egl.ext.b_EGL_KHR_image_base &&
-         gfx::g_driver_egl.ext.b_EGL_KHR_gl_texture_2D_image &&
-         gfx::g_driver_gl.ext.b_GL_OES_EGL_image);
+  DCHECK(gl::g_driver_egl.ext.b_EGL_KHR_image_base &&
+         gl::g_driver_egl.ext.b_EGL_KHR_gl_texture_2D_image &&
+         gl::g_driver_gl.ext.b_GL_OES_EGL_image);
 
   const EGLint egl_attrib_list[] = {
       EGL_GL_TEXTURE_LEVEL_KHR, 0, EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
   EGLClientBuffer egl_buffer = reinterpret_cast<EGLClientBuffer>(texture_id);
   EGLenum egl_target = EGL_GL_TEXTURE_2D_KHR;
 
   EGLImageKHR egl_image = eglCreateImageKHR(
       egl_display, egl_context, egl_target, egl_buffer, egl_attrib_list);
 
   if (egl_image == EGL_NO_IMAGE_KHR) {
@@ skipping 79 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(NativeImageBufferStub);
 };
 
 bool g_avoid_egl_target_texture_reuse = false;
 
 }  // anonymous namespace
 
 // static
 scoped_refptr<NativeImageBuffer> NativeImageBuffer::Create(GLuint texture_id) {
-  switch (gfx::GetGLImplementation()) {
+  switch (gl::GetGLImplementation()) {
 #if !defined(OS_MACOSX)
-    case gfx::kGLImplementationEGLGLES2:
+    case gl::kGLImplementationEGLGLES2:
       return NativeImageBufferEGL::Create(texture_id);
 #endif
-    case gfx::kGLImplementationMockGL:
+    case gl::kGLImplementationMockGL:
       return new NativeImageBufferStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 // static
 void TextureDefinition::AvoidEGLTargetTextureReuse() {
   g_avoid_egl_target_texture_reuse = true;
@@ skipping 88 matching lines @@
   GLuint texture_id;
   glGenTextures(1, &texture_id);
 
   Texture* texture(new Texture(texture_id));
   UpdateTextureInternal(texture);
 
   return texture;
 }
 
 void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
-  gfx::ScopedTextureBinder texture_binder(target_, texture->service_id());
+  gl::ScopedTextureBinder texture_binder(target_, texture->service_id());
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t_);
 
   if (image_buffer_.get()) {
     gl::GLImage* existing_image = texture->GetLevelImage(target_, 0);
     // Don't need to re-bind if already bound before.
     if (!existing_image || !image_buffer_->IsClient(existing_image)) {
       image_buffer_->BindToTexture(target_);
@@ skipping 74 matching lines @@
   return true;
 }
 
 bool TextureDefinition::SafeToRenderFrom() const {
   return level_info_.cleared_rect.Contains(
       gfx::Rect(level_info_.width, level_info_.height));
 }
 
 }  // namespace gles2
 }  // namespace gpu