ui/gl: Move GLImage into gl namespace.

gpu/command_buffer/service/texture_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
 
 #include <algorithm>
 #include <list>
 #include <set>
@@ skipping 134 matching lines @@
       GLint target, GLint level,
       GLsizei* width, GLsizei* height, GLsizei* depth) const;
 
   // Get the type of a level. Returns false if level does not exist.
   bool GetLevelType(
       GLint target, GLint level, GLenum* type, GLenum* internal_format) const;
 
   // Set the image for a particular level.
   void SetLevelImage(GLenum target,
                      GLint level,
-                     gfx::GLImage* image,
+                     gl::GLImage* image,
                      ImageState state);
 
   // Get the image associated with a particular level. Returns NULL if level
   // does not exist.
-  gfx::GLImage* GetLevelImage(GLint target,
-                              GLint level,
-                              ImageState* state) const;
-  gfx::GLImage* GetLevelImage(GLint target, GLint level) const;
+  gl::GLImage* GetLevelImage(GLint target,
+                             GLint level,
+                             ImageState* state) const;
+  gl::GLImage* GetLevelImage(GLint target, GLint level) const;
 
   bool HasImages() const {
     return has_images_;
   }
 
   // Returns true of the given dimensions are inside the dimensions of the
   // level.
   bool ValidForTexture(
       GLint target,
       GLint level,
@@ skipping 82 matching lines @@
     gfx::Rect cleared_rect;
     GLenum target;
     GLint level;
     GLenum internal_format;
     GLsizei width;
     GLsizei height;
     GLsizei depth;
     GLint border;
     GLenum format;
     GLenum type;
-    scoped_refptr<gfx::GLImage> image;
+    scoped_refptr<gl::GLImage> image;
     ImageState image_state;
     uint32 estimated_size;
   };
 
   struct FaceInfo {
     FaceInfo();
     ~FaceInfo();
 
     GLsizei num_mip_levels;
     std::vector<LevelInfo> level_infos;
@@ skipping 525 matching lines @@
     }
   }
 
   size_t mem_represented() const {
     return memory_type_tracker_->GetMemRepresented();
   }
 
   void SetLevelImage(TextureRef* ref,
                      GLenum target,
                      GLint level,
-                     gfx::GLImage* image,
+                     gl::GLImage* image,
                      Texture::ImageState state);
 
   size_t GetSignatureSize() const;
 
   void AddToSignature(
       TextureRef* ref,
       GLenum target,
       GLint level,
       std::string* signature) const;
 
@@ skipping 151 matching lines @@
  private:
   DecoderTextureState* texture_state_;
   base::TimeTicks begin_time_;
   DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer);
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_