| Index: content/common/gpu/media/gpu_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| index 621e47c926f899f677a746e591e43fb44f9c54d9..f92df105ffcb860c03871dac474707bb5e5cb42a 100644
|
| --- a/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
|
| @@ -36,9 +36,7 @@ class GpuVideoDecodeAccelerator
|
|
|
| // media::VideoDecodeAccelerator::Client implementation.
|
| virtual void ProvidePictureBuffers(
|
| - uint32 requested_num_of_buffers,
|
| - const gfx::Size& dimensions,
|
| - media::VideoDecodeAccelerator::MemoryType type) OVERRIDE;
|
| + uint32 requested_num_of_buffers, const gfx::Size& dimensions) OVERRIDE;
|
| virtual void DismissPictureBuffer(int32 picture_buffer_id) OVERRIDE;
|
| virtual void PictureReady(const media::Picture& picture) OVERRIDE;
|
| virtual void NotifyInitializeDone() OVERRIDE;
|
| @@ -67,7 +65,7 @@ class GpuVideoDecodeAccelerator
|
| void OnDecode(
|
| const gpu::ReadWriteTokens& /* tokens */,
|
| base::SharedMemoryHandle handle, int32 id, int32 size);
|
| - void OnAssignGLESBuffers(
|
| + void OnAssignPictureBuffers(
|
| const gpu::ReadWriteTokens& /* tokens */,
|
| const std::vector<int32>& buffer_ids,
|
| const std::vector<uint32>& texture_ids,
|
|
|