| Index: content/renderer/media/android/webmediaplayer_android.h
|
| diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h
|
| index fd6555e22729bda9f7595ff48f480101853e7d20..9fefb6b2b846959a582e9cb4eb5f15282ccf0c65 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.h
|
| +++ b/content/renderer/media/android/webmediaplayer_android.h
|
| @@ -236,7 +236,7 @@ class WebMediaPlayerAndroid
|
| static void OnReleaseRemotePlaybackTexture(
|
| const scoped_refptr<base::MessageLoopProxy>& main_loop,
|
| const base::WeakPtr<WebMediaPlayerAndroid>& player,
|
| - uint32 sync_point);
|
| + scoped_ptr<gpu::MailboxHolder> mailbox_holder);
|
|
|
| protected:
|
| // Helper method to update the playing state.
|
| @@ -266,7 +266,8 @@ class WebMediaPlayerAndroid
|
| void ReallocateVideoFrame();
|
| void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);
|
| void DidLoadMediaInfo(MediaInfoLoader::Status status);
|
| - void DoReleaseRemotePlaybackTexture(uint32 sync_point);
|
| + void DoReleaseRemotePlaybackTexture(
|
| + scoped_ptr<gpu::MailboxHolder> mailbox_holder);
|
|
|
| bool IsKeySystemSupported(const blink::WebString& key_system);
|
|
|
|
|