Revert of Fix broken draw/upload paths from videos to 2D canvas and WebGL.

third_party/WebKit/public/platform/WebMediaPlayer.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 159 matching lines @@
   virtual unsigned DecodedFrameCount() const = 0;
   virtual unsigned DroppedFrameCount() const = 0;
   virtual unsigned CorruptedFrameCount() const { return 0; }
   virtual size_t AudioDecodedByteCount() const = 0;
   virtual size_t VideoDecodedByteCount() const = 0;
 
   virtual void Paint(WebCanvas*, const WebRect&, cc::PaintFlags&) = 0;
 
   // TODO(kbr): remove non-|target| version. crbug.com/349871
   //
-  // Do a GPU-GPU texture copy of the current video frame to |texture|,
-  // reallocating |texture| at the appropriate size with given internal
-  // format, format, and type if necessary. If the copy is impossible
-  // or fails, it returns false.
+  // Do a GPU-GPU texture copy of the natural size of the current
+  // video frame to |texture|. Caller is responsible for allocating
+  // |texture| with the appropriate size. If the copy is impossible or
+  // fails, it returns false.
   virtual bool CopyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*,
                                                  unsigned texture,
-                                                 unsigned internal_format,
-                                                 unsigned format,
-                                                 unsigned type,
                                                  bool premultiply_alpha,
                                                  bool flip_y) {
     return false;
   }
 
+  // TODO(kbr): when updating calling code to use this, remove the
+  // |internalFormat| and |type| parameters. crbug.com/349871
   // Do a GPU-GPU textures copy. If the copy is impossible or fails, it returns
   // false.
   virtual bool CopyVideoTextureToPlatformTexture(gpu::gles2::GLES2Interface*,
                                                  unsigned target,
                                                  unsigned texture,
                                                  unsigned internal_format,
                                                  unsigned type,
                                                  int level,
                                                  bool premultiply_alpha,
                                                  bool flip_y) {
@@ skipping 82 matching lines @@
   virtual bool GetLastUploadedFrameInfo(unsigned* width,
                                         unsigned* height,
                                         double* timestamp) {
     return false;
   }
 };
 
 }  // namespace blink
 
 #endif