| Index: content/renderer/media/webmediaplayer_ms.cc
|
| diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
|
| index 34ad2a78473094fb65ec8ba80b10de584f2775ba..84214fc4be0d5767046e983b86237fcab1eaa3c0 100644
|
| --- a/content/renderer/media/webmediaplayer_ms.cc
|
| +++ b/content/renderer/media/webmediaplayer_ms.cc
|
| @@ -411,18 +411,6 @@
|
| unsigned int type,
|
| bool premultiply_alpha,
|
| bool flip_y) {
|
| - return copyVideoTextureToPlatformTexture(web_graphics_context, texture,
|
| - internal_format, type,
|
| - premultiply_alpha, flip_y);
|
| -}
|
| -
|
| -bool WebMediaPlayerMS::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", "WebMediaPlayerMS:copyVideoTextureToPlatformTexture");
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| @@ -443,8 +431,8 @@
|
| static_cast<gpu_blink::WebGraphicsContext3DImpl*>(web_graphics_context)
|
| ->GetGLInterface();
|
| media::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;
|
| }
|
|
|
|
|