Eliminate MediaPlayer & MediaPlayerClient abstractions

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 216 matching lines @@
 {
     if (m_webMediaPlayer)
         m_webMediaPlayer->exitFullscreen();
 }
 
 bool WebMediaPlayerClientImpl::canShowFullscreenOverlay() const
 {
     return m_webMediaPlayer && m_webMediaPlayer->canEnterFullscreen();
 }
 
-IntSize WebMediaPlayerClientImpl::naturalSize() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->naturalSize();
-    return IntSize();
-}
-
-bool WebMediaPlayerClientImpl::hasVideo() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->hasVideo();
-    return false;
-}
-
-bool WebMediaPlayerClientImpl::hasAudio() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->hasAudio();
-    return false;
-}
-
 double WebMediaPlayerClientImpl::duration() const
 {
     if (m_webMediaPlayer)
         return m_webMediaPlayer->duration();
     return 0.0;
 }
 
 double WebMediaPlayerClientImpl::currentTime() const
 {
     if (m_webMediaPlayer)
@@ skipping 116 matching lines @@
         m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preload));
 }
 
 bool WebMediaPlayerClientImpl::hasSingleSecurityOrigin() const
 {
     if (m_webMediaPlayer)
         return m_webMediaPlayer->hasSingleSecurityOrigin();
     return false;
 }
 
-bool WebMediaPlayerClientImpl::didPassCORSAccessCheck() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->didPassCORSAccessCheck();
-    return false;
-}
-
 double WebMediaPlayerClientImpl::mediaTimeForTimeValue(double timeValue) const
 {
     if (m_webMediaPlayer)
         return m_webMediaPlayer->mediaTimeForTimeValue(timeValue);
     return timeValue;
 }
 
-unsigned WebMediaPlayerClientImpl::decodedFrameCount() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->decodedFrameCount();
-    return 0;
-}
-
-unsigned WebMediaPlayerClientImpl::droppedFrameCount() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->droppedFrameCount();
-    return 0;
-}
-
-unsigned WebMediaPlayerClientImpl::corruptedFrameCount() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->corruptedFrameCount();
-    return 0;
-}
-
-unsigned WebMediaPlayerClientImpl::audioDecodedByteCount() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->audioDecodedByteCount();
-    return 0;
-}
-
-unsigned WebMediaPlayerClientImpl::videoDecodedByteCount() const
-{
-    if (m_webMediaPlayer)
-        return m_webMediaPlayer->videoDecodedByteCount();
-    return 0;
-}
-
 #if ENABLE(WEB_AUDIO)
 AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider()
 {
     return &m_audioSourceProvider;
 }
 #endif
 
 PassOwnPtr<MediaPlayer> WebMediaPlayerClientImpl::create(MediaPlayerClient* client)
 {
     return adoptPtr(new WebMediaPlayerClientImpl(client));
 }
 
 #if OS(ANDROID)
 void WebMediaPlayerClientImpl::paintOnAndroid(WebCore::GraphicsContext* context, const IntRect& rect, uint8_t alpha)
 {
     OwnPtr<blink::WebGraphicsContext3DProvider> provider = adoptPtr(blink::Platform::current()->createSharedOffscreenGraphicsContext3DProvider());
     if (!provider)
         return;
     WebGraphicsContext3D* context3D = provider->context3d();
     if (!context || !context3D || !m_webMediaPlayer || context->paintingDisabled())
         return;
 
     if (!context3D->makeContextCurrent())
         return;
 
     // Copy video texture into a RGBA texture based bitmap first as video texture on Android is GL_TEXTURE_EXTERNAL_OES
     // which is not supported by Skia yet. The bitmap's size needs to be the same as the video and use naturalSize() here.
     // Check if we could reuse existing texture based bitmap.
     // Otherwise, release existing texture based bitmap and allocate a new one based on video size.
-    if (!ensureTextureBackedSkBitmap(provider->grContext(), m_bitmap, naturalSize(), kTopLeft_GrSurfaceOrigin, kSkia8888_GrPixelConfig))
+    if (!ensureTextureBackedSkBitmap(provider->grContext(), m_bitmap, m_webMediaPlayer->naturalSize(), kTopLeft_GrSurfaceOrigin, kSkia8888_GrPixelConfig))
         return;
 
     // Copy video texture to bitmap texture.
     WebCanvas* canvas = context->canvas();
     unsigned textureId = static_cast<unsigned>((m_bitmap.getTexture())->getTextureHandle());
     if (!m_webMediaPlayer->copyVideoTextureToPlatformTexture(context3D, textureId, 0, GL_RGBA, GL_UNSIGNED_BYTE, true, false))
         return;
 
     // Draw the texture based bitmap onto the Canvas. If the canvas is hardware based, this will do a GPU-GPU texture copy. If the canvas is software based,
     // the texture based bitmap will be readbacked to system memory then draw onto the canvas.
@@ skipping 71 matching lines @@
 
 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannels, float sampleRate)
 {
     if (m_client)
         m_client->setFormat(numberOfChannels, sampleRate);
 }
 
 #endif
 
 } // namespace blink