| Index: content/common/gpu/media/gpu_jpeg_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/gpu_jpeg_decode_accelerator.h b/content/common/gpu/media/gpu_jpeg_decode_accelerator.h
|
| index b6cf847c030365076f9eaa2d0a4dec45056bd4b0..680dac578e09ef31d370647b28661cb3d09b4303 100644
|
| --- a/content/common/gpu/media/gpu_jpeg_decode_accelerator.h
|
| +++ b/content/common/gpu/media/gpu_jpeg_decode_accelerator.h
|
| @@ -20,9 +20,11 @@ namespace base {
|
| class SingleThreadTaskRunner;
|
| }
|
|
|
| -namespace content {
|
| +namespace gpu {
|
| class GpuChannel;
|
| +}
|
|
|
| +namespace content {
|
| class GpuJpegDecodeAccelerator
|
| : public IPC::Sender,
|
| public base::NonThreadSafe,
|
| @@ -30,7 +32,7 @@ class GpuJpegDecodeAccelerator
|
| public:
|
| // |channel| must outlive this object.
|
| GpuJpegDecodeAccelerator(
|
| - GpuChannel* channel,
|
| + gpu::GpuChannel* channel,
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
|
| ~GpuJpegDecodeAccelerator() override;
|
|
|
| @@ -61,10 +63,10 @@ class GpuJpegDecodeAccelerator
|
| static scoped_ptr<media::JpegDecodeAccelerator> CreateVaapiJDA(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
|
|
|
| - // The lifetime of objects of this class is managed by a GpuChannel. The
|
| + // The lifetime of objects of this class is managed by a gpu::GpuChannel. The
|
| // GpuChannels destroy all the GpuJpegDecodeAccelerator that they own when
|
| // they are destroyed. So a raw pointer is safe.
|
| - GpuChannel* channel_;
|
| + gpu::GpuChannel* channel_;
|
|
|
| // The message filter to run JpegDecodeAccelerator::Decode on IO thread.
|
| scoped_refptr<MessageFilter> filter_;
|
|
|