ui/gl: Move GLImage into gl namespace.

content/common/gpu/media/vt_video_decode_accelerator.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 18 matching lines @@
 
 // Preload VideoToolbox libraries, needed for sandbox warmup.
 bool InitializeVideoToolbox();
 
 // VideoToolbox.framework implementation of the VideoDecodeAccelerator
 // interface for Mac OS X (currently limited to 10.9+).
 class VTVideoDecodeAccelerator : public media::VideoDecodeAccelerator {
  public:
   explicit VTVideoDecodeAccelerator(
       const base::Callback<bool(void)>& make_context_current,
-      const base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)>&
+      const base::Callback<void(uint32, uint32, scoped_refptr<gl::GLImage>)>&
           bind_image);
   ~VTVideoDecodeAccelerator() override;
 
   // VideoDecodeAccelerator implementation.
   bool Initialize(media::VideoCodecProfile profile, Client* client) override;
   void Decode(const media::BitstreamBuffer& bitstream) override;
   void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& pictures) override;
   void ReusePictureBuffer(int32_t picture_id) override;
   void Flush() override;
@@ skipping 70 matching lines @@
   struct PictureInfo {
     PictureInfo(uint32_t client_texture_id, uint32_t service_texture_id);
     ~PictureInfo();
 
     // Image buffer, kept alive while they are bound to pictures.
     base::ScopedCFTypeRef<CVImageBufferRef> cv_image;
 
     // The GLImage representation of |cv_image|. This is kept around to ensure
     // that Destroy is called on it before it hits its destructor (there is a
     // DCHECK that requires this).
-    scoped_refptr<gfx::GLImageIOSurface> gl_image;
+    scoped_refptr<gl::GLImageIOSurface> gl_image;
 
     // Texture IDs for the image buffer.
     const uint32_t client_texture_id;
     const uint32_t service_texture_id;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(PictureInfo);
   };
 
   //
@@ skipping 39 matching lines @@
   // These methods returns true if a task was completed, false otherwise.
   bool ProcessTaskQueue();
   bool ProcessReorderQueue();
   bool ProcessFrame(const Frame& frame);
   bool SendFrame(const Frame& frame);
 
   //
   // GPU thread state.
   //
   base::Callback<bool(void)> make_context_current_;
-  base::Callback<void(uint32, uint32, scoped_refptr<gfx::GLImage>)> bind_image_;
+  base::Callback<void(uint32, uint32, scoped_refptr<gl::GLImage>)> bind_image_;
   media::VideoDecodeAccelerator::Client* client_;
   State state_;
 
   // Queue of pending flush tasks. This is used to drop frames when a reset
   // is pending.
   std::queue<TaskType> pending_flush_tasks_;
 
   // Queue of tasks to complete in the GPU thread.
   std::queue<Task> task_queue_;
 
@@ skipping 57 matching lines @@
   // Declared last to ensure that all weak pointers are invalidated before
   // other destructors run.
   base::WeakPtrFactory<VTVideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VTVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_