| Index: content/renderer/media/webmediaplayer_ms.h
|
| diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
|
| index 24b2d6b6b2cef341eec993469b4ac6c95dfa94b5..3a89e0e766c3ef6e684f07d35c859adeaefa6bc8 100644
|
| --- a/content/renderer/media/webmediaplayer_ms.h
|
| +++ b/content/renderer/media/webmediaplayer_ms.h
|
| @@ -13,7 +13,7 @@
|
| #include "base/synchronization/lock.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "content/common/content_export.h"
|
| -#include "content/public/renderer/render_frame_observer.h"
|
| +#include "media/blink/webmediaplayer_delegate.h"
|
| #include "media/blink/webmediaplayer_util.h"
|
| #include "media/renderers/gpu_video_accelerator_factories.h"
|
| #include "media/renderers/skcanvas_video_renderer.h"
|
| @@ -30,7 +30,6 @@ class WebString;
|
|
|
| namespace media {
|
| class MediaLog;
|
| -class WebMediaPlayerDelegate;
|
| class VideoFrame;
|
| }
|
|
|
| @@ -60,8 +59,8 @@ class RenderFrameObserver;
|
| // WebKit client of this media player object.
|
| class CONTENT_EXPORT WebMediaPlayerMS
|
| : public NON_EXPORTED_BASE(blink::WebMediaPlayer),
|
| - public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>),
|
| - public NON_EXPORTED_BASE(RenderFrameObserver) {
|
| + public NON_EXPORTED_BASE(media::WebMediaPlayerDelegate::Observer),
|
| + public NON_EXPORTED_BASE(base::SupportsWeakPtr<WebMediaPlayerMS>) {
|
| public:
|
| // Construct a WebMediaPlayerMS with reference to the client, and
|
| // a MediaStreamClient which provides VideoFrameProvider.
|
| @@ -135,10 +134,11 @@ class CONTENT_EXPORT WebMediaPlayerMS
|
| unsigned audioDecodedByteCount() const override;
|
| unsigned videoDecodedByteCount() const override;
|
|
|
| - // RenderFrameObserver implementation. Called when the RenderFrame visiblity
|
| - // is changed.
|
| - void WasHidden() override;
|
| - void WasShown() override;
|
| + // WebMediaPlayerDelegate::Observer implementation.
|
| + void OnHidden() override;
|
| + void OnShown() override;
|
| + void OnPlay() override;
|
| + void OnPause() override;
|
|
|
| bool copyVideoTextureToPlatformTexture(
|
| blink::WebGraphicsContext3D* web_graphics_context,
|
|
|