Chromium Code Reviews| 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 a1762394142c7a54705b11aefd32f1e803d3a0e2..88f72a4d4e83140eba4d991cd9f7dc333cab72ba 100644 |
| --- a/content/renderer/media/android/webmediaplayer_android.h |
| +++ b/content/renderer/media/android/webmediaplayer_android.h |
| @@ -135,11 +135,32 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
| unsigned char alpha, |
| SkXfermode::Mode mode); |
| + // TODO(dshwang): remove it. virtual trick allows to remove it in blink. |
| + // crbug.com/504773 |
| + virtual bool copyVideoTextureToPlatformTexture( |
| + blink::WebGraphicsContext3D* web_graphics_context, |
| + unsigned int texture, |
| + unsigned int internal_format, |
| + unsigned int type, |
| + bool premultiply_alpha, |
| + bool flip_y); |
| + |
| bool copyVideoTextureToPlatformTexture( |
| blink::WebGraphicsContext3D* web_graphics_context, |
| + unsigned int target, |
| unsigned int texture, |
| unsigned int internal_format, |
| unsigned int type, |
| + int level, |
| + bool premultiply_alpha, |
| + bool flip_y) override; |
| + bool copyVideoSubTextureToPlatformTexture( |
|
oetuaho-nv
2015/10/01 07:46:21
I think that it needs to be clearer that this is c
dshwang
2015/10/21 16:12:15
This method is removed as unifying both into copyV
|
| + blink::WebGraphicsContext3D* web_graphics_context, |
| + unsigned int target, |
| + unsigned int texture, |
| + int level, |
| + int xoffset, |
| + int yoffset, |
| bool premultiply_alpha, |
| bool flip_y) override; |
| @@ -301,6 +322,18 @@ class WebMediaPlayerAndroid : public blink::WebMediaPlayer, |
| bool allow_stored_credentials); |
| bool IsKeySystemSupported(const std::string& key_system); |
| bool IsLocalResource(); |
| + bool CopyVideoTextureToPlatformTextureInternal( |
| + blink::WebGraphicsContext3D* web_graphics_context, |
| + bool is_full_copy, |
| + unsigned int target, |
| + unsigned int texture, |
| + unsigned int internal_format, |
| + unsigned int type, |
| + int level, |
| + int xoffset, |
| + int yoffset, |
| + bool premultiply_alpha, |
| + bool flip_y); |
| // Actually do the work for generateKeyRequest/addKey so they can easily |
| // report results to UMA. |