Enable 2D Canvas painting for Chrome on Android.

webkit/media/android/webmediaplayer_android.cc

 // Copyright (c) 2012 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 "webkit/media/android/webmediaplayer_android.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "cc/layers/video_layer.h"
+#include "gpu/GLES2/gl2extchromium.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/video_frame.h"
 #include "net/base/mime_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/media/android/webmediaplayer_manager_android.h"
 #include "webkit/media/media_switches.h"
 #include "webkit/media/webmediaplayer_util.h"
 
 static const uint32 kGLTextureExternalOES = 0x8D65;
@@ skipping 218 matching lines @@
 
 void WebMediaPlayerAndroid::setSize(const WebKit::WebSize& size) {
 }
 
 void WebMediaPlayerAndroid::paint(WebKit::WebCanvas* canvas,
                                   const WebKit::WebRect& rect,
                                   uint8_t alpha) {
   NOTIMPLEMENTED();
 }
 
+bool WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture(
+    WebKit::WebGraphicsContext3D* web_graphics_context,
+    unsigned int texture,
+    unsigned int level,
+    unsigned int internal_format,
+    bool premultiply_alpha,
+    bool flip_y) {
+  if (!texture_id_)
+    return false;
+
+  // The video is stored in a unmultiplied format, so premultiply if

[xhwang, 2013/04/16 17:51:36]

nit: s/a/an/

[hkuang1, 2013/04/18 01:05:07]

Done.

+  // necessary.
+  web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
+                                    premultiply_alpha);
+
+  // Application itself needs to take care of setting the right flip_y
+  // value down to get the expected result.
+  // flip_y==true means to reverse the video orientation while
+  // flip_y==false means to keep the intrinsic orientation.
+  web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, flip_y);
+  web_graphics_context->copyTextureCHROMIUM(GL_TEXTURE_2D, texture_id_,
+                                            texture, level, internal_format);
+  web_graphics_context->pixelStorei(GL_UNPACK_FLIP_Y_CHROMIUM, false);
+  web_graphics_context->pixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM,
+                                    false);

[xhwang, 2013/04/16 17:51:36]

We have web_graphics_context->flush() for better performance in
webmediaplayer_impl.cc. Does that also apply here?

[hkuang1, 2013/04/18 01:05:07]

This may bring some performance gain on desktop platform as Jun mention in his
change. But I do not have the tool to measure here on Android, so just skip
unnecessary flush for safety purpose.  

+  return true;
+}
+
 bool WebMediaPlayerAndroid::hasSingleSecurityOrigin() const {
   return false;
 }
 
 bool WebMediaPlayerAndroid::didPassCORSAccessCheck() const {
   return false;
 }
 
 WebMediaPlayer::MovieLoadType WebMediaPlayerAndroid::movieLoadType() const {
   // Deprecated.
@@ skipping 215 matching lines @@
 
 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) {
   needs_establish_peer_ = needs_establish_peer;
 }
 
 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) {
   is_playing_ = is_playing;
 }
 
 }  // namespace webkit_media