| commit | 6d5f7a33a78c7c3a3ae05d0724b4abcab531b29f | [log] [tgz] |
|---|---|---|
| author | Bo Liu <boliu@google.com> | Wed Mar 12 20:24:10 2014 -0700 |
| committer | Bo Liu <boliu@google.com> | Wed Mar 12 20:24:10 2014 -0700 |
| tree | 13984dab8731b82b9608161df66dadd3d0e0d3d4 | |
| parent | 871ad5406650fa38062582bc125fffcd2f6d5159 [diff] |
Fork: Early out WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture This is to prevent crash for reading back a video into a canvas. This never worked in webview with software canvas, so not a regression. BUG: 13328348 Change-Id: I6d9d722f27603c9669a2a92cde54a3e6d852ad8b
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc index a39ae56..88c9dfd 100644 --- a/content/renderer/media/android/webmediaplayer_android.cc +++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -525,6 +525,9 @@ unsigned int type, bool premultiply_alpha, bool flip_y) { + // ---> FORK <---- + return false; + // ---> END FORK <---- if (is_remote_ || !texture_id_) return false;