Revert of webgl: optimize webgl.texSubImage2D(video) path.

content/renderer/media/webmediaplayer_ms.cc

 // Copyright 2013 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 "content/renderer/media/webmediaplayer_ms.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 329 matching lines @@
 }
 
 unsigned WebMediaPlayerMS::videoDecodedByteCount() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   NOTIMPLEMENTED();
   return 0;
 }
 
 bool WebMediaPlayerMS::copyVideoTextureToPlatformTexture(
     blink::WebGraphicsContext3D* web_graphics_context,
-    const CopyVideoTextureParams& params) {
+    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());
-  DCHECK((params.copyType == CopyVideoTextureParams::FullCopy &&
-          !params.xoffset && !params.yoffset) ||
-         (params.copyType == CopyVideoTextureParams::SubCopy &&
-          !params.internalFormat && !params.type));
 
   scoped_refptr<media::VideoFrame> video_frame = compositor_->GetCurrentFrame();
 
   if (!video_frame.get() || video_frame->HasTextures() ||
       media::VideoFrame::NumPlanes(video_frame->format()) != 1) {
     return false;
   }
 
   // TODO(dshwang): need more elegant way to convert WebGraphicsContext3D to
   // GLES2Interface.
   gpu::gles2::GLES2Interface* const gl =
       static_cast<gpu_blink::WebGraphicsContext3DImpl*>(web_graphics_context)
           ->GetGLInterface();
-  typedef media::SkCanvasVideoRenderer::CopyFrameSingleTextureParams CopyParams;
   media::SkCanvasVideoRenderer::CopyVideoFrameSingleTextureToGLTexture(
-      gl, video_frame.get(),
-      CopyParams(params.copyType == CopyVideoTextureParams::FullCopy
-                     ? CopyParams::FullCopy
-                     : CopyParams::SubCopy,
-                 params.target, params.texture, params.internalFormat,
-                 params.type, params.level, params.xoffset, params.yoffset,
-                 params.premultiplyAlpha, params.flipY));
+      gl, video_frame.get(), texture, internal_format, type, premultiply_alpha,
+      flip_y);
   return true;
 }
 
 void WebMediaPlayerMS::OnFrameAvailable(
     const scoped_refptr<media::VideoFrame>& frame) {
   DVLOG(3) << __FUNCTION__;
   DCHECK(thread_checker_.CalledOnValidThread());
 
   base::TimeTicks render_time;
   if (frame->metadata()->GetTimeTicks(media::VideoFrameMetadata::REFERENCE_TIME,
@@ skipping 49 matching lines @@
   get_client()->networkStateChanged();
 }
 
 void WebMediaPlayerMS::SetReadyState(WebMediaPlayer::ReadyState state) {
   DCHECK(thread_checker_.CalledOnValidThread());
   ready_state_ = state;
   // Always notify to ensure client has the latest value.
   get_client()->readyStateChanged();
 }
 }  // namespace content