| Index: cc/resources/video_resource_updater.h
|
| diff --git a/cc/resources/video_resource_updater.h b/cc/resources/video_resource_updater.h
|
| index 3567e7eecd513bee18665e92d32f2a7009335a2d..5dad98503ac9a701d4ac34513bcb94d48375dd3f 100644
|
| --- a/cc/resources/video_resource_updater.h
|
| +++ b/cc/resources/video_resource_updater.h
|
| @@ -47,6 +47,10 @@ class VideoFrameExternalResources {
|
| ResourceType type;
|
| std::vector<TextureMailbox> mailboxes;
|
|
|
| + // TODO(danakj): Remove these when we get a Mailbox from VideoFrame.
|
| + unsigned hardware_resource;
|
| + TextureMailbox::ReleaseCallback hardware_release_callback;
|
| +
|
| // TODO(danakj): Remove these too.
|
| std::vector<unsigned> software_resources;
|
| TextureMailbox::ReleaseCallback software_release_callback;
|
| @@ -64,8 +68,7 @@ class VideoResourceUpdater
|
| ~VideoResourceUpdater();
|
|
|
| VideoFrameExternalResources CreateForHardwarePlanes(
|
| - const scoped_refptr<media::VideoFrame>& video_frame,
|
| - const TextureMailbox::ReleaseCallback& release_callback);
|
| + const scoped_refptr<media::VideoFrame>& video_frame);
|
|
|
| VideoFrameExternalResources CreateForSoftwarePlanes(
|
| const scoped_refptr<media::VideoFrame>& video_frame);
|
| @@ -101,9 +104,7 @@ class VideoResourceUpdater
|
| unsigned sync_point,
|
| bool lost_resource);
|
| static void ReturnTexture(ResourceProvider* resource_provider,
|
| - TextureMailbox::ReleaseCallback callback,
|
| - unsigned texture_id,
|
| - gpu::Mailbox mailbox,
|
| + unsigned resource_id,
|
| unsigned sync_point,
|
| bool lost_resource);
|
|
|
|
|