Eliminate MediaPlayer & MediaPlayerClient abstractions(rate, setRate and 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 380683b173f4715adebd76644a288b3f03b27a4b..857f9dfbf8fd345f9a707e753f4bfdb3ccf01986 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -1710,7 +1710,7 @@ void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*)
     double time = WTF::currentTime();
     double timedelta = time - m_previousProgressTime;
 
-    if (m_player->didLoadingProgress()) {
+    if (webMediaPlayer() && webMediaPlayer()->didLoadingProgress()) {
         scheduleEvent(EventTypeNames::progress);
         m_previousProgressTime = time;
         m_sentStalledEvent = false;
@@ -1987,15 +1987,15 @@ void HTMLMediaElement::setPlaybackRate(double rate)
         scheduleEvent(EventTypeNames::ratechange);
     }
 
-    if (m_player && potentiallyPlaying() && m_player->rate() != rate && !m_mediaController)
-        m_player->setRate(rate);
+    if (m_player && potentiallyPlaying() && !m_mediaController)
+        webMediaPlayer()->setRate(rate);
 }
 
 void HTMLMediaElement::updatePlaybackRate()
 {
     double effectiveRate = m_mediaController ? m_mediaController->playbackRate() : m_playbackRate;
-    if (m_player && potentiallyPlaying() && m_player->rate() != effectiveRate)
-        m_player->setRate(effectiveRate);
+    if (m_player && potentiallyPlaying())
+        webMediaPlayer()->setRate(effectiveRate);
 }
 
 bool HTMLMediaElement::ended() const
@@ -2895,13 +2895,13 @@ void HTMLMediaElement::mediaPlayerSizeChanged()
 
 PassRefPtr<TimeRanges> HTMLMediaElement::buffered() const
 {
-    if (!m_player)
-        return TimeRanges::create();
-
     if (m_mediaSource)
         return m_mediaSource->buffered();
 
-    return m_player->buffered();
+    if (!webMediaPlayer())
+        return TimeRanges::create();
+
+    return TimeRanges::create(webMediaPlayer()->buffered());
 }
 
 PassRefPtr<TimeRanges> HTMLMediaElement::played()
@@ -2920,8 +2920,8 @@ PassRefPtr<TimeRanges> HTMLMediaElement::played()
 
 PassRefPtr<TimeRanges> HTMLMediaElement::seekable() const
 {
-    if (m_player) {
-        double maxTimeSeekable = m_player->maxTimeSeekable();
+    if (webMediaPlayer()) {
+        double maxTimeSeekable = webMediaPlayer()->maxTimeSeekable();
         if (maxTimeSeekable)
             return TimeRanges::create(0, maxTimeSeekable);
     }
@@ -3031,7 +3031,7 @@ void HTMLMediaElement::updatePlayState()
         if (playerPaused) {
             // Set rate, muted before calling play in case they were set before the media engine was setup.
             // The media engine should just stash the rate and muted values since it isn't already playing.
-            m_player->setRate(m_playbackRate);
+            webMediaPlayer()->setRate(m_playbackRate);

[acolwell GONE FROM CHROMIUM, 2014/06/06 05:35:37]

Is this call actually still needed? Your WebMediaPlayerClientImpl::load() change
seems like it would remove the need for this based on what the comment says.

[Srirama, 2014/06/06 05:56:32]

You are right, it is not needed. Initially i thought we may miss setRate value
if webMediaPlayer is not created by that time, but all setRate calls from
HTMLMediaElement comes after the webMediaPlayer has been created. I will remove
it.

On 2014/06/06 05:35:37, acolwell wrote:

             updateVolume();
             webMediaPlayer()->play();
         }