| 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 5e96e8384204889a052bbd593e9bc4f5c9d2aaf1..5a573f7506fca1d0066e6ff0c2951b92d3b6e7d5 100644
|
| --- a/content/renderer/media/android/webmediaplayer_android.h
|
| +++ b/content/renderer/media/android/webmediaplayer_android.h
|
| @@ -18,10 +18,10 @@
|
| #include "base/time/default_tick_clock.h"
|
| #include "base/time/time.h"
|
| #include "cc/layers/video_frame_provider.h"
|
| -#include "content/common/media/media_player_messages_enums_android.h"
|
| #include "content/public/renderer/render_frame_observer.h"
|
| #include "content/renderer/media/android/media_info_loader.h"
|
| #include "content/renderer/media/android/media_source_delegate.h"
|
| +#include "content/renderer/media/android/renderer_media_player_manager.h"
|
| #include "content/renderer/media/android/stream_texture_factory.h"
|
| #include "gpu/command_buffer/common/mailbox.h"
|
| #include "media/base/android/media_player_android.h"
|
| @@ -81,7 +81,8 @@ class RendererMediaPlayerManager;
|
| class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
|
| public cc::VideoFrameProvider,
|
| public RenderFrameObserver,
|
| - public StreamTextureFactoryContextObserver {
|
| + public StreamTextureFactoryContextObserver,
|
| + public media::RendererMediaPlayerInterface {
|
| public:
|
| // Construct a WebMediaPlayerAndroid object. This class communicates with the
|
| // MediaPlayerAndroid object in the browser process through |proxy|.
|
| @@ -221,7 +222,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
|
| // This function is called by the RendererMediaPlayerManager to pause the
|
| // video and release the media player and surface texture when we switch tabs.
|
| // However, the actual GlTexture is not released to keep the video screenshot.
|
| - void SuspendAndReleaseResources();
|
| + void SuspendAndReleaseResources() override;
|
|
|
| // RenderFrameObserver implementation.
|
| void OnDestruct() override;
|
|
|