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..c7692e4bfb5e69e3052d1fca2151ac080f9112db 100644 |
--- a/cc/resources/video_resource_updater.h |
+++ b/cc/resources/video_resource_updater.h |
@@ -63,11 +63,7 @@ class VideoResourceUpdater |
explicit VideoResourceUpdater(ResourceProvider* resource_provider); |
~VideoResourceUpdater(); |
- VideoFrameExternalResources CreateForHardwarePlanes( |
- const scoped_refptr<media::VideoFrame>& video_frame, |
- const TextureMailbox::ReleaseCallback& release_callback); |
- |
- VideoFrameExternalResources CreateForSoftwarePlanes( |
+ VideoFrameExternalResources CreateExternalResourcesFromVideoFrame( |
const scoped_refptr<media::VideoFrame>& video_frame); |
private: |
@@ -88,6 +84,10 @@ class VideoResourceUpdater |
}; |
bool VerifyFrame(const scoped_refptr<media::VideoFrame>& video_frame); |
+ VideoFrameExternalResources CreateForHardwarePlanes( |
+ const scoped_refptr<media::VideoFrame>& video_frame); |
+ VideoFrameExternalResources CreateForSoftwarePlanes( |
+ const scoped_refptr<media::VideoFrame>& video_frame); |
struct RecycleResourceData { |
unsigned resource_id; |
@@ -101,9 +101,7 @@ class VideoResourceUpdater |
unsigned sync_point, |
bool lost_resource); |
static void ReturnTexture(ResourceProvider* resource_provider, |
- TextureMailbox::ReleaseCallback callback, |
- unsigned texture_id, |
- gpu::Mailbox mailbox, |
+ scoped_refptr<media::VideoFrame> video_frame, |
unsigned sync_point, |
bool lost_resource); |