media: Optimize HW Video to 2D Canvas copy.

content/renderer/media/android/webmediaplayer_android.h

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 727fc8eaf0a94eb21f4b287c30fe37c7337be335..dba7ba485f9c8f57cdb634b3138e4395ea84ba8f 100644
--- a/content/renderer/media/android/webmediaplayer_android.h
+++ b/content/renderer/media/android/webmediaplayer_android.h
@@ -26,13 +26,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 {
@@ -43,6 +40,7 @@ namespace blink {
 class WebContentDecryptionModule;
 class WebContentDecryptionModuleResult;
 class WebFrame;
+class WebGraphicsContext3D;
 class WebURL;
 }
 
@@ -112,10 +110,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,
@@ -314,11 +308,6 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
       blink::WebContentDecryptionModuleResult result,
       bool success);
 
-  bool EnsureTextureBackedSkBitmap(GrContext* gr, SkBitmap& bitmap,
-                                   const blink::WebSize& size,
-                                   GrSurfaceOrigin origin,
-                                   GrPixelConfig config);
-
   bool IsHLSStream() const;
 
   blink::WebFrame* const frame_;
@@ -484,7 +473,7 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer,
   // player_manager_->SetCdm() directly.
   media::DecryptorReadyCB decryptor_ready_cb_;
 
-  SkBitmap bitmap_;
+  media::SkCanvasVideoRenderer skcanvas_video_renderer_;
 
   // Whether stored credentials are allowed to be passed to the server.
   bool allow_stored_credentials_;