ui/gl: Move GLImage into gl namespace.

gpu/command_buffer/service/stream_texture_manager_in_process_android.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 "gpu/command_buffer/service/stream_texture_manager_in_process_android.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gl/android/surface_texture.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_image.h"
 
 namespace gpu {
 
 namespace {
 
 // Simply wraps a SurfaceTexture reference as a GLImage.
-class GLImageImpl : public gfx::GLImage {
+class GLImageImpl : public gl::GLImage {
  public:
   GLImageImpl(uint32 texture_id,
               gles2::TextureManager* texture_manager,
               const scoped_refptr<gfx::SurfaceTexture>& surface_texture,
               const base::Closure& release_callback);
 
-  // implement gfx::GLImage
+  // implement gl::GLImage
   void Destroy(bool have_context) override;
   gfx::Size GetSize() override;
   unsigned GetInternalFormat() override;
   bool BindTexImage(unsigned target) override;
   void ReleaseTexImage(unsigned target) override;
   bool CopyTexImage(unsigned target) override;
   bool CopyTexSubImage(unsigned target,
                        const gfx::Point& offset,
                        const gfx::Rect& rect) override;
   bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
@@ skipping 123 matching lines @@
     return 0;
   }
 
   scoped_refptr<gfx::SurfaceTexture> surface_texture(
       gfx::SurfaceTexture::Create(texture->service_id()));
 
   uint32 stream_id = next_id_++;
   base::Closure release_callback =
       base::Bind(&StreamTextureManagerInProcess::OnReleaseStreamTexture,
                  weak_factory_.GetWeakPtr(), stream_id);
-  scoped_refptr<gfx::GLImage> gl_image(
+  scoped_refptr<gl::GLImage> gl_image(
       new GLImageImpl(texture->service_id(), texture_manager, surface_texture,
                       release_callback));
 
   gfx::Size size = gl_image->GetSize();
   texture_manager->SetTarget(texture, GL_TEXTURE_EXTERNAL_OES);
   texture_manager->SetLevelInfo(texture, GL_TEXTURE_EXTERNAL_OES, 0, GL_RGBA,
                                 size.width(), size.height(), 1, 0, GL_RGBA,
                                 GL_UNSIGNED_BYTE, gfx::Rect(size));
   texture_manager->SetLevelImage(texture, GL_TEXTURE_EXTERNAL_OES, 0,
                                  gl_image.get(), gles2::Texture::UNBOUND);
@@ skipping 20 matching lines @@
 StreamTextureManagerInProcess::GetSurfaceTexture(uint32 stream_id) {
   base::AutoLock lock(map_lock_);
   TextureMap::const_iterator it = textures_.find(stream_id);
   if (it != textures_.end())
     return it->second;
 
   return NULL;
 }
 
 }  // namespace gpu