| Index: media/gpu/ipc/client/gpu_jpeg_decode_accelerator_host.h
|
| diff --git a/media/gpu/ipc/client/gpu_jpeg_decode_accelerator_host.h b/media/gpu/ipc/client/gpu_jpeg_decode_accelerator_host.h
|
| index 4293961fba0078594c8e200a4cfa836b22a9f87f..e6665d41810d5096161725b2abc9c7dcf2984928 100644
|
| --- a/media/gpu/ipc/client/gpu_jpeg_decode_accelerator_host.h
|
| +++ b/media/gpu/ipc/client/gpu_jpeg_decode_accelerator_host.h
|
| @@ -11,7 +11,8 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| +#include "base/threading/thread_checker.h"
|
| +#include "media/gpu/mojo/jpeg_decoder.mojom.h"
|
| #include "media/video/jpeg_decode_accelerator.h"
|
|
|
| namespace base {
|
| @@ -29,10 +30,13 @@ class Message;
|
|
|
| namespace media {
|
|
|
| +// TODO(c.padhi): Move GpuJpegDecodeAcceleratorHost to media/gpu/mojo, see
|
| +// http://crbug.com/699255.
|
| // This class is used to talk to JpegDecodeAccelerator in the GPU process
|
| // through IPC messages.
|
| -class GpuJpegDecodeAcceleratorHost : public JpegDecodeAccelerator,
|
| - public base::NonThreadSafe {
|
| +class GpuJpegDecodeAcceleratorHost
|
| + : public JpegDecodeAccelerator,
|
| + public mojom::GpuJpegDecodeAcceleratorClient {
|
| public:
|
| GpuJpegDecodeAcceleratorHost(
|
| scoped_refptr<gpu::GpuChannelHost> channel,
|
| @@ -48,6 +52,9 @@ class GpuJpegDecodeAcceleratorHost : public JpegDecodeAccelerator,
|
| const scoped_refptr<VideoFrame>& video_frame) override;
|
| bool IsSupported() override;
|
|
|
| + // mojom::GpuJpegDecodeAcceleratorClient implementation.
|
| + void OnDecodeAck(int32_t bitstream_buffer_id, mojom::Error error) override;
|
| +
|
| base::WeakPtr<IPC::Listener> GetReceiver();
|
|
|
| private:
|
| @@ -65,6 +72,7 @@ class GpuJpegDecodeAcceleratorHost : public JpegDecodeAccelerator,
|
|
|
| std::unique_ptr<Receiver> receiver_;
|
|
|
| + THREAD_CHECKER(thread_checker_);
|
| DISALLOW_COPY_AND_ASSIGN(GpuJpegDecodeAcceleratorHost);
|
| };
|
|
|
|
|