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

media/blink/webmediaplayer_impl.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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 634 matching lines @@
 
 unsigned WebMediaPlayerImpl::videoDecodedByteCount() const {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   PipelineStatistics stats = pipeline_.GetStatistics();
   return stats.video_bytes_decoded;
 }
 
 bool WebMediaPlayerImpl::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", "WebMediaPlayerImpl:copyVideoTextureToPlatformTexture");
-  DCHECK((params.copyType == CopyVideoTextureParams::FullCopy &&
-          !params.xoffset && !params.yoffset) ||
-         (params.copyType == CopyVideoTextureParams::SubCopy &&
-          !params.internalFormat && !params.type));
 
   scoped_refptr<VideoFrame> video_frame = GetCurrentFrameFromCompositor();
 
   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* gl =
       static_cast<gpu_blink::WebGraphicsContext3DImpl*>(web_graphics_context)
           ->GetGLInterface();
-  typedef SkCanvasVideoRenderer::CopyFrameSingleTextureParams CopyParams;
   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;
 }
 
 WebMediaPlayer::MediaKeyException
 WebMediaPlayerImpl::generateKeyRequest(const WebString& key_system,
                                        const unsigned char* init_data,
                                        unsigned init_data_length) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   return encrypted_media_support_.GenerateKeyRequest(
@@ skipping 419 matching lines @@
            << ", Video: " << stats.video_memory_usage << ", DataSource: "
            << (data_source_ ? data_source_->GetMemoryUsage() : 0)
            << ", Demuxer: " << (demuxer_ ? demuxer_->GetMemoryUsage() : 0);
 
   const int64_t delta = current_memory_usage - last_reported_memory_usage_;
   last_reported_memory_usage_ = current_memory_usage;
   adjust_allocated_memory_cb_.Run(delta);
 }
 
 }  // namespace media