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

Source/core/html/HTMLMediaElement.cpp

Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index 42f201be24c22d76ea68cd36081d7fbe823fab14..74ba6ba01c1e31a153df35e666deede03d837f81 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -1724,7 +1724,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()
@@ -1780,12 +1780,15 @@ 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.
+    if (webMediaPlayer()) {

[acolwell GONE FROM CHROMIUM, 2014/06/02 22:24:26]

Do you really need this? I don't believe it is possible for m_readyState to be >
HAVE_NOTHING and webMediaPlayer() return a null pointer. If so, I think that
might be a bug.

[Srirama, 2014/06/03 05:48:01]

Done.

+        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);
+            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
@@ -2830,7 +2833,7 @@ void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
     if (!m_player || m_pausedInternal)
         return;
 
-    if (m_player->paused())
+    if (webMediaPlayer() && webMediaPlayer()->paused())

[acolwell GONE FROM CHROMIUM, 2014/06/02 22:24:26]

Remove pointer check. The call to this method comes from the WebMediaPlayer
instance. webMediaPlayer() should never return a null pointer here.

[Srirama, 2014/06/03 05:48:01]

Done.

         pause();
     else
         playInternal();
@@ -3002,8 +3005,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())
@@ -3012,7 +3015,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));
@@ -3027,7 +3030,8 @@ void HTMLMediaElement::updatePlayState()
             m_player->setRate(m_playbackRate);
             updateVolume();
 
-            m_player->play();
+            if (webMediaPlayer())

[acolwell GONE FROM CHROMIUM, 2014/06/02 22:24:26]

Is this really necessary? I believe the conditions in potentiallyPlaying() and
playerPaused equalling true ensure that webMediaPlayer() is non-null at this
point.

[Srirama, 2014/06/03 05:48:01]

Done.

+                webMediaPlayer()->play();
         }
 
         if (hasMediaControls())
@@ -3036,8 +3040,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();