| Index: media/blink/webmediaplayer_impl.cc
|
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
|
| index 0a7e600e7330710090713c3bab814b4cd23e9296..12839eb06eeceecbc38ef54299c90695a5cd0ae6 100644
|
| --- a/media/blink/webmediaplayer_impl.cc
|
| +++ b/media/blink/webmediaplayer_impl.cc
|
| @@ -587,18 +587,6 @@
|
| unsigned int type,
|
| bool premultiply_alpha,
|
| bool flip_y) {
|
| - return copyVideoTextureToPlatformTexture(web_graphics_context, texture,
|
| - internal_format, type,
|
| - premultiply_alpha, flip_y);
|
| -}
|
| -
|
| -bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture(
|
| - blink::WebGraphicsContext3D* web_graphics_context,
|
| - unsigned int texture,
|
| - unsigned int internal_format,
|
| - unsigned int type,
|
| - bool premultiply_alpha,
|
| - bool flip_y) {
|
| TRACE_EVENT0("media", "WebMediaPlayerImpl:copyVideoTextureToPlatformTexture");
|
|
|
| scoped_refptr<VideoFrame> video_frame =
|
| @@ -615,8 +603,8 @@
|
| static_cast<gpu_blink::WebGraphicsContext3DImpl*>(web_graphics_context)
|
| ->GetGLInterface();
|
| SkCanvasVideoRenderer::CopyVideoFrameTextureToGLTexture(
|
| - gl, video_frame.get(), texture, internal_format, type, premultiply_alpha,
|
| - flip_y);
|
| + gl, video_frame.get(), texture, level, internal_format, type,
|
| + premultiply_alpha, flip_y);
|
| return true;
|
| }
|
|
|
|
|