Eliminate MediaPlayer & MediaPlayerClient abstractions(seek, duration, poster 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 91f87f6d7aef089312dd1dd65cbea2124e420c4d..eebfa8c8895546f83d9c0862839bed76ddff0f51 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -1841,7 +1841,7 @@ void HTMLMediaElement::seek(double time, ExceptionState& exceptionState)
     scheduleEvent(EventTypeNames::seeking);
 
     // 9 - Set the current playback position to the given new playback position
-    m_player->seek(time);
+    webMediaPlayer()->seek(time);
 
     // 10-14 are handled, if necessary, when the engine signals a readystate change or otherwise
     // satisfies seek completion and signals a time change.
@@ -1881,7 +1881,7 @@ bool HTMLMediaElement::seeking() const
 
 void HTMLMediaElement::refreshCachedTime() const
 {
-    m_cachedTime = m_player->currentTime();
+    m_cachedTime = webMediaPlayer() ? webMediaPlayer()->currentTime() : 0.0;

[acolwell GONE FROM CHROMIUM, 2014/06/03 17:02:38]

Just return early w/o modifying m_cachedTime or m_cachedTimeWallClockUpdateTime
if webMediaPlayer() is null.  The webMediaPlayer() guard in currentTime()
prevents m_cachedTime from being used w/o a webMediaPlayer() now.

[Srirama, 2014/06/04 06:01:12]

Done.

     m_cachedTimeWallClockUpdateTime = WTF::currentTime();
 }
 
@@ -1905,7 +1905,7 @@ double HTMLMediaElement::currentTime() const
     static const double minCachedDeltaForWarning = 0.01;
 #endif
 
-    if (!m_player)
+    if (!m_player || !webMediaPlayer())
         return 0;
 
     if (m_seeking) {
@@ -1915,7 +1915,7 @@ double HTMLMediaElement::currentTime() const
 
     if (m_cachedTime != MediaPlayer::invalidTime() && m_paused) {
 #if LOG_CACHED_TIME_WARNINGS
-        double delta = m_cachedTime - m_player->currentTime();
+        double delta = m_cachedTime - webMediaPlayer()->currentTime();
         if (delta > minCachedDeltaForWarning)
             WTF_LOG(Media, "HTMLMediaElement::currentTime - WARNING, cached time is %f seconds off of media time when paused", delta);
 #endif
@@ -1954,7 +1954,7 @@ double HTMLMediaElement::duration() const
     if (m_mediaSource)
         return m_mediaSource->duration();
 
-    return m_player->duration();
+    return webMediaPlayer()->duration();
 }
 
 bool HTMLMediaElement::paused() const
@@ -2770,7 +2770,7 @@ void HTMLMediaElement::mediaPlayerTimeChanged()
     invalidateCachedTime();
 
     // 4.8.10.9 steps 12-14. Needed if no ReadyState change is associated with the seek.
-    if (m_seeking && m_readyState >= HAVE_CURRENT_DATA && !m_player->seeking())
+    if (m_seeking && m_readyState >= HAVE_CURRENT_DATA && !webMediaPlayer()->seeking())
         finishSeek();
 
     // Always call scheduleTimeupdateEvent when the media engine reports a time discontinuity,