Eliminate MediaPlayer & MediaPlayerClient abstractions(play/pause, other APIs)

BUG=350571

Review URL: https://codereview.chromium.org/298093004

git-svn-id: svn://svn.chromium.org/blink/trunk@175508 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

@@ -1733,7 +1733,7 @@ void HTMLMediaElement::addPlayedRange(double start, double end)
 
 bool HTMLMediaElement::supportsSave() const
 {
-    return m_player ? m_player->supportsSave() : false;
+    return webMediaPlayer() && webMediaPlayer()->supportsSave();
 }
 
 void HTMLMediaElement::prepareToPlay()
@@ -1789,12 +1789,13 @@ void HTMLMediaElement::seek(double time, ExceptionState& exceptionState)
     // time scale, we will ask the media engine to "seek" to the current movie time, which may be a noop and
     // not generate a timechanged callback. This means m_seeking will never be cleared and we will never
     // fire a 'seeked' event.
+    double mediaTime = webMediaPlayer()->mediaTimeForTimeValue(time);
+    if (time != mediaTime) {
 #if !LOG_DISABLED
-    double mediaTime = m_player->mediaTimeForTimeValue(time);
-    if (time != mediaTime)
         WTF_LOG(Media, "HTMLMediaElement::seek(%f) - media timeline equivalent is %f", time, mediaTime);
 #endif
-    time = m_player->mediaTimeForTimeValue(time);
+        time = mediaTime;
+    }
 
     // 7 - If the (possibly now changed) new playback position is not in one of the ranges given in the
     // seekable attribute, then let it be the position in one of the ranges given in the seekable attribute
@@ -2839,7 +2840,7 @@ void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
     if (!m_player || m_pausedInternal)
         return;
 
-    if (m_player->paused())
+    if (webMediaPlayer()->paused())
         pause();
     else
         playInternal();
@@ -3005,8 +3006,8 @@ void HTMLMediaElement::updatePlayState()
         return;
 
     if (m_pausedInternal) {
-        if (!m_player->paused())
-            m_player->pause();
+        if (webMediaPlayer() && !webMediaPlayer()->paused())
+            webMediaPlayer()->pause();
         refreshCachedTime();
         m_playbackProgressTimer.stop();
         if (hasMediaControls())
@@ -3015,7 +3016,7 @@ void HTMLMediaElement::updatePlayState()
     }
 
     bool shouldBePlaying = potentiallyPlaying();
-    bool playerPaused = m_player->paused();
+    bool playerPaused = webMediaPlayer() && webMediaPlayer()->paused();
 
     WTF_LOG(Media, "HTMLMediaElement::updatePlayState - shouldBePlaying = %s, playerPaused = %s",
         boolString(shouldBePlaying), boolString(playerPaused));
@@ -3029,8 +3030,7 @@ void HTMLMediaElement::updatePlayState()
             // The media engine should just stash the rate and muted values since it isn't already playing.
             m_player->setRate(m_playbackRate);
             updateVolume();
-
-            m_player->play();
+            webMediaPlayer()->play();
         }
 
         if (hasMediaControls())
@@ -3039,8 +3039,8 @@ void HTMLMediaElement::updatePlayState()
         m_playing = true;
 
     } else { // Should not be playing right now
-        if (!playerPaused)
-            m_player->pause();
+        if (!playerPaused && webMediaPlayer())
+            webMediaPlayer()->pause();
         refreshCachedTime();
 
         m_playbackProgressTimer.stop();

third_party/WebKit/Source/core/html/HTMLMediaElement.h

@@ -234,7 +234,7 @@ public:
     // of one of them here.
     virtual ExecutionContext* executionContext() const OVERRIDE FINAL { return HTMLElement::executionContext(); }
 
-    bool hasSingleSecurityOrigin() const { return !m_player || m_player->hasSingleSecurityOrigin(); }
+    bool hasSingleSecurityOrigin() const { return webMediaPlayer() && webMediaPlayer()->hasSingleSecurityOrigin(); }
 
     bool isFullscreen() const;
     void enterFullscreen();

third_party/WebKit/Source/platform/graphics/media/MediaPlayer.h

@@ -112,11 +112,6 @@ public:
 
     virtual void load(blink::WebMediaPlayer::LoadType, const String& url, blink::WebMediaPlayer::CORSMode) = 0;
 
-    virtual void play() = 0;
-    virtual void pause() = 0;
-
-    virtual bool supportsSave() const = 0;
-
     virtual double duration() const = 0;
 
     virtual double currentTime() const = 0;
@@ -128,8 +123,6 @@ public:
     virtual double rate() const = 0;
     virtual void setRate(double) = 0;
 
-    virtual bool paused() const = 0;
-
     virtual void setPoster(const KURL&) = 0;
 
     enum NetworkState { Empty, Idle, Loading, Loaded, FormatError, NetworkError, DecodeError };
@@ -149,12 +142,6 @@ public:
     enum Preload { None, MetaData, Auto };
     virtual void setPreload(Preload) = 0;
 
-    virtual bool hasSingleSecurityOrigin() const = 0;
-
-    // Time value in the movie's time scale. It is only necessary to override this if the media
-    // engine uses rational numbers to represent media time.
-    virtual double mediaTimeForTimeValue(double timeValue) const = 0;
-
 #if ENABLE(WEB_AUDIO)
     virtual AudioSourceProvider* audioSourceProvider() = 0;
 #endif

third_party/WebKit/Source/web/WebMediaPlayerClientImpl.cpp

@@ -205,18 +205,6 @@ void WebMediaPlayerClientImpl::load(WebMediaPlayer::LoadType loadType, const WTF
     m_webMediaPlayer->load(loadType, kurl, corsMode);
 }
 
-void WebMediaPlayerClientImpl::play()
-{
-    if (m_webMediaPlayer)
-        m_webMediaPlayer->play();
-}
-
-void WebMediaPlayerClientImpl::pause()
-{
-    if (m_webMediaPlayer)
-        m_webMediaPlayer->pause();
-}
-
 double WebMediaPlayerClientImpl::duration() const
 {
     if (m_webMediaPlayer)
@@ -256,20 +244,6 @@ void WebMediaPlayerClientImpl::setRate(double rate)
         m_webMediaPlayer->setRate(rate);
 }
 
-bool WebMediaPlayerClientImpl::paused() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->paused();
-    return false;
-}
-
-bool WebMediaPlayerClientImpl::supportsSave() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->supportsSave();
-    return false;
-}
-
 void WebMediaPlayerClientImpl::setPoster(const KURL& poster)
 {
     if (m_webMediaPlayer)
@@ -346,20 +320,6 @@ void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload)
         m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preload));
 }
 
-bool WebMediaPlayerClientImpl::hasSingleSecurityOrigin() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->hasSingleSecurityOrigin();
-    return false;
-}
-
-double WebMediaPlayerClientImpl::mediaTimeForTimeValue(double timeValue) const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->mediaTimeForTimeValue(timeValue);
-    return timeValue;
-}
-
 #if ENABLE(WEB_AUDIO)
 AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider()
 {

third_party/WebKit/Source/web/WebMediaPlayerClientImpl.h

@@ -94,16 +94,12 @@ public:
     // MediaPlayer methods:
     virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
     virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
-    virtual void play() OVERRIDE;
-    virtual void pause() OVERRIDE;
-    virtual bool supportsSave() const OVERRIDE;
     virtual double duration() const OVERRIDE;
     virtual double currentTime() const OVERRIDE;
     virtual void seek(double time) OVERRIDE;
     virtual bool seeking() const OVERRIDE;
     virtual double rate() const OVERRIDE;
     virtual void setRate(double) OVERRIDE;
-    virtual bool paused() const OVERRIDE;
     virtual void setPoster(const WebCore::KURL&) OVERRIDE;
     virtual WebCore::MediaPlayer::NetworkState networkState() const OVERRIDE;
     virtual WebCore::MediaPlayer::ReadyState readyState() const OVERRIDE;
@@ -113,8 +109,6 @@ public:
     virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERRIDE;
     virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, Platform3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premultiplyAlpha, bool flipY) OVERRIDE;
     virtual void setPreload(WebCore::MediaPlayer::Preload) OVERRIDE;
-    virtual bool hasSingleSecurityOrigin() const OVERRIDE;
-    virtual double mediaTimeForTimeValue(double timeValue) const OVERRIDE;
 
 #if ENABLE(WEB_AUDIO)
     virtual WebCore::AudioSourceProvider* audioSourceProvider() OVERRIDE;