Eliminate MediaPlayer abstraction(paint APIs)

Source/web/WebMediaPlayerClientImpl.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebMediaPlayerClientImpl_h
 #define WebMediaPlayerClientImpl_h
 
 #include "platform/audio/AudioSourceProvider.h"
 #include "platform/graphics/media/MediaPlayer.h"
 #include "public/platform/WebAudioSourceProviderClient.h"
 #include "public/platform/WebMediaPlayerClient.h"
-#include "third_party/khronos/GLES2/gl2.h"
-#if OS(ANDROID)
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkRefCnt.h"
-#include "third_party/skia/include/gpu/GrTexture.h"
-#endif
 #include "platform/weborigin/KURL.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
 namespace blink {
 class AudioSourceProviderClient;
 class HTMLMediaElement;
 }
 
 namespace blink {
 
 class WebAudioSourceProvider;
 class WebContentDecryptionModule;
 class WebMediaPlayer;
-class WebGraphicsContext3D;
 
 // This class serves as a bridge between blink::MediaPlayer and
 // blink::WebMediaPlayer.
 class WebMediaPlayerClientImpl FINAL : public blink::MediaPlayer, public WebMediaPlayerClient {
 
 public:
     static PassOwnPtr<blink::MediaPlayer> create(blink::MediaPlayerClient*);
 
     virtual ~WebMediaPlayerClientImpl();
 
@@ skipping 21 matching lines @@
     virtual void removeVideoTrack(WebMediaPlayer::TrackId) OVERRIDE;
     virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;
     virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;
     virtual void requestFullscreen() OVERRIDE;
     virtual void requestSeek(double) OVERRIDE;
 
     // MediaPlayer methods:
     virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
     virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
-    virtual void paint(blink::GraphicsContext*, const blink::IntRect&) OVERRIDE;
-    virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, Platform3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premultiplyAlpha, bool flipY) OVERRIDE;
     virtual void setPreload(blink::MediaPlayer::Preload) OVERRIDE;
 
 #if ENABLE(WEB_AUDIO)
     virtual blink::AudioSourceProvider* audioSourceProvider() OVERRIDE;
 #endif
 
 private:
     explicit WebMediaPlayerClientImpl(blink::MediaPlayerClient*);
 
     blink::HTMLMediaElement& mediaElement() const;
 
     blink::MediaPlayerClient* m_client;
     OwnPtr<WebMediaPlayer> m_webMediaPlayer;
     blink::MediaPlayer::Preload m_preload;
 
-#if OS(ANDROID)
-    // FIXME: This path "only works" on Android. It is a workaround for the problem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
-    // texture internally. It should be removed and replaced by the normal paint path.
-    // https://code.google.com/p/skia/issues/detail?id=1189
-    void paintOnAndroid(blink::GraphicsContext*, const blink::IntRect&, uint8_t alpha);
-    SkBitmap m_bitmap;
-    bool m_usePaintOnAndroid;
-#endif
-
 #if ENABLE(WEB_AUDIO)
     // AudioClientImpl wraps an AudioSourceProviderClient.
     // When the audio format is known, Chromium calls setFormat() which then dispatches into WebCore.
 
     class AudioClientImpl FINAL : public blink::WebAudioSourceProviderClient {
     public:
         AudioClientImpl(blink::AudioSourceProviderClient* client)
             : m_client(client)
         {
         }
@@ skipping 32 matching lines @@
         Mutex provideInputLock;
     };
 
     AudioSourceProviderImpl m_audioSourceProvider;
 #endif
 };
 
 } // namespace blink
 
 #endif