Index: content/renderer/media/android/webmediaplayer_android.h |
diff --git a/content/renderer/media/android/webmediaplayer_android.h b/content/renderer/media/android/webmediaplayer_android.h |
index 1b90148d93adf047724be3a86d9159e1e51ef421..004a0c89bfebf2da359b3eb12ab4edbd6034d684 100644 |
--- a/content/renderer/media/android/webmediaplayer_android.h |
+++ b/content/renderer/media/android/webmediaplayer_android.h |
@@ -25,13 +25,10 @@ |
#include "media/base/android/media_player_android.h" |
#include "media/base/demuxer_stream.h" |
#include "media/base/media_keys.h" |
-#include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |
+#include "media/filters/skcanvas_video_renderer.h" |
#include "third_party/WebKit/public/platform/WebMediaPlayer.h" |
#include "third_party/WebKit/public/platform/WebSize.h" |
#include "third_party/WebKit/public/platform/WebURL.h" |
-#include "third_party/skia/include/core/SkBitmap.h" |
-#include "third_party/skia/include/gpu/GrContext.h" |
-#include "third_party/skia/include/gpu/SkGrPixelRef.h" |
#include "ui/gfx/rect_f.h" |
namespace base { |
@@ -40,6 +37,7 @@ class MessageLoopProxy; |
namespace blink { |
class WebContentDecryptionModule; |
+class WebGraphicsContext3D; |
class WebFrame; |
class WebURL; |
} |
@@ -106,10 +104,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
virtual void setPoster(const blink::WebURL& poster) OVERRIDE; |
// Methods for painting. |
- // FIXME: This path "only works" on Android. It is a workaround for the |
- // issue 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 |
virtual void paint(blink::WebCanvas* canvas, |
const blink::WebRect& rect, |
unsigned char alpha); |
@@ -284,11 +278,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
// NULL immediately and reset. |
void SetDecryptorReadyCB(const media::DecryptorReadyCB& decryptor_ready_cb); |
- bool EnsureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap, |
- const blink::WebSize& size, |
- GrSurfaceOrigin origin, |
- GrPixelConfig config); |
- |
blink::WebFrame* const frame_; |
blink::WebMediaPlayerClient* const client_; |
@@ -448,7 +437,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
// player_manager_->SetCdm() directly. |
media::DecryptorReadyCB decryptor_ready_cb_; |
- SkBitmap bitmap_; |
+ media::SkCanvasVideoRenderer skcanvas_video_renderer_; |
// NOTE: Weak pointers must be invalidated before all other member variables. |
base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; |