| Index: media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h
|
| diff --git a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h b/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h
|
| index f4a3c7a6aa5113a4d99c9d5720575dceea664e1e..81b33237d22f72ca31d1fda5a3cc2acc9e42f472 100644
|
| --- a/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h
|
| +++ b/media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h
|
| @@ -13,9 +13,10 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/synchronization/waitable_event.h"
|
| -#include "base/threading/non_thread_safe.h"
|
| +#include "base/threading/thread_checker.h"
|
| #include "ipc/ipc_listener.h"
|
| #include "ipc/ipc_sender.h"
|
| +#include "media/gpu/mojo/jpeg_decoder.mojom.h"
|
| #include "media/video/jpeg_decode_accelerator.h"
|
|
|
| namespace base {
|
| @@ -41,9 +42,11 @@ class GpuJpegDecodeAcceleratorFactoryProvider {
|
| static std::vector<CreateAcceleratorCB> GetAcceleratorFactories();
|
| };
|
|
|
| +// TODO(c.padhi): Move GpuJpegDecodeAccelerator to media/gpu/mojo, see
|
| +// http://crbug.com/699255.
|
| class GpuJpegDecodeAccelerator
|
| - : public IPC::Sender,
|
| - public base::NonThreadSafe,
|
| + : public mojom::GpuJpegDecodeAccelerator,
|
| + public IPC::Sender,
|
| public base::SupportsWeakPtr<GpuJpegDecodeAccelerator> {
|
| public:
|
| // |channel| must outlive this object.
|
| @@ -68,6 +71,12 @@ class GpuJpegDecodeAccelerator
|
| int32_t bitstream_buffer_id,
|
| JpegDecodeAccelerator::Error error);
|
|
|
| + // mojom::GpuJpegDecodeAccelerator implementation.
|
| + void Initialize(mojom::GpuJpegDecodeAcceleratorClientPtr client,
|
| + InitializeCallback callback) override;
|
| + void Decode(mojom::JpegDecodeInfoPtr info) override;
|
| + void Uninitialize() override;
|
| +
|
| // Function to delegate sending to actual sender.
|
| bool Send(IPC::Message* message) override;
|
|
|
| @@ -94,6 +103,7 @@ class GpuJpegDecodeAccelerator
|
| // Number of clients added to |filter_|.
|
| int client_number_;
|
|
|
| + THREAD_CHECKER(thread_checker_);
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(GpuJpegDecodeAccelerator);
|
| };
|
|
|
|
|