Revert 175683 "Eliminate MediaPlayer & MediaPlayerClient abstrac..."

trunk/Source/web/WebMediaPlayerClientImpl.cpp

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/WebMediaPlayerClientImpl.h"
 
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/TimeRanges.h"
@@ skipping 187 matching lines @@
 
 #if OS(ANDROID)
     m_usePaintOnAndroid = (loadType != WebMediaPlayer::LoadTypeMediaStream);
 #endif
 
     // Tell WebMediaPlayer about any connected CDM (may be null).
     m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia::contentDecryptionModule(mediaElement()));
     m_webMediaPlayer->load(loadType, kurl, corsMode);
 }
 
+double WebMediaPlayerClientImpl::rate() const
+{
+    return m_rate;
+}
+
+void WebMediaPlayerClientImpl::setRate(double rate)
+{
+    m_rate = rate;
+    if (m_webMediaPlayer)
+        m_webMediaPlayer->setRate(rate);
+}
+
 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const
 {
     if (m_webMediaPlayer)
         return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkState());
     return MediaPlayer::Empty;
 }
 
 MediaPlayer::ReadyState WebMediaPlayerClientImpl::readyState() const
 {
     if (m_webMediaPlayer)
         return static_cast<MediaPlayer::ReadyState>(m_webMediaPlayer->readyState());
     return MediaPlayer::HaveNothing;
 }
 
+double WebMediaPlayerClientImpl::maxTimeSeekable() const
+{
+    if (m_webMediaPlayer)
+        return m_webMediaPlayer->maxTimeSeekable();
+    return 0.0;
+}
+
+PassRefPtr<TimeRanges> WebMediaPlayerClientImpl::buffered() const
+{
+    if (m_webMediaPlayer)
+        return TimeRanges::create(m_webMediaPlayer->buffered());
+    return TimeRanges::create();
+}
+
+bool WebMediaPlayerClientImpl::didLoadingProgress() const
+{
+    return m_webMediaPlayer && m_webMediaPlayer->didLoadingProgress();
+}
+
 void WebMediaPlayerClientImpl::paint(GraphicsContext* context, const IntRect& rect)
 {
     // Normally GraphicsContext operations do nothing when painting is disabled.
     // Since we're accessing platformContext() directly we have to manually
     // check.
     if (m_webMediaPlayer && !context->paintingDisabled()) {
         // On Android, video frame is emitted as GL_TEXTURE_EXTERNAL_OES texture. We use a different path to
         // paint the video frame into the context.
 #if OS(ANDROID)
         if (m_usePaintOnAndroid) {
@@ skipping 69 matching lines @@
     SkPaint paint;
     paint.setAlpha(alpha);
     // It is not necessary to pass the dest into the drawBitmap call since all the context have been set up before calling paintCurrentFrameInContext.
     canvas->drawBitmapRect(m_bitmap, NULL, dest, &paint);
 }
 #endif
 
 WebMediaPlayerClientImpl::WebMediaPlayerClientImpl(MediaPlayerClient* client)
     : m_client(client)
     , m_preload(MediaPlayer::Auto)
+    , m_rate(1.0)
 #if OS(ANDROID)
     , m_usePaintOnAndroid(false)
 #endif
 {
     ASSERT(m_client);
 }
 
 WebCore::HTMLMediaElement& WebMediaPlayerClientImpl::mediaElement() const
 {
     return *static_cast<HTMLMediaElement*>(m_client);
@@ skipping 48 matching lines @@
 
 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannels, float sampleRate)
 {
     if (m_client)
         m_client->setFormat(numberOfChannels, sampleRate);
 }
 
 #endif
 
 } // namespace blink