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

media/renderers/skcanvas_video_renderer.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_RENDERERS_SKCANVAS_VIDEO_RENDERER_H_
 #define MEDIA_RENDERERS_SKCANVAS_VIDEO_RENDERER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 46 matching lines @@
             cc::PaintCanvas* canvas,
             const Context3D& context_3d);
 
   // Convert the contents of |video_frame| to raw RGB pixels. |rgb_pixels|
   // should point into a buffer large enough to hold as many 32 bit RGBA pixels
   // as are in the visible_rect() area of the frame.
   static void ConvertVideoFrameToRGBPixels(const media::VideoFrame* video_frame,
                                            void* rgb_pixels,
                                            size_t row_bytes);
 
+  // CopyTexture uses CopyTextureCHROMIUM internally; CopySubTexture
+  // uses CopySubTextureCHROMIUM. The two options are provided because
+  // this is on the performance-critical path, and CopyTextureCHROMIUM
+  // is more efficient in the situation where new textures are being
+  // allocated often. (This currently happens on macOS where the
+  // source textures are rectangular.)
+  enum SingleFrameCopyMode {
+    SingleFrameCopyTexture,
+    SingleFrameCopySubTexture
+  };
+
   // Copy the contents of texture of |video_frame| to texture |texture|.
   // |level|, |internal_format|, |type| specify target texture |texture|.
   // The format of |video_frame| must be VideoFrame::NATIVE_TEXTURE.
-  // Assumes |texture| has already been allocated with the appropriate
-  // size and a compatible format, internal format and type; this is
-  // effectively a "TexSubImage" operation.
+  //
+  // |internal_format| and |type| are used if |mode| is
+  // SingleFrameCopyTexture. Otherwise assumes |texture| has already
+  // been allocated with the appropriate size and a compatible format,
+  // internal format and type, and is effectively a "TexSubImage"
+  // operation.
   static void CopyVideoFrameSingleTextureToGLTexture(
       gpu::gles2::GLES2Interface* gl,
       VideoFrame* video_frame,
+      SingleFrameCopyMode mode,
       unsigned int texture,
+      unsigned int internal_format,
+      unsigned int type,
       bool premultiply_alpha,
       bool flip_y);
 
   // Copy the contents of texture of |video_frame| to texture |texture| in
   // context |destination_gl|.
   // |level|, |internal_format|, |type| specify target texture |texture|.
   // The format of |video_frame| must be VideoFrame::NATIVE_TEXTURE.
   // |context_3d| has a GrContext that may be used during the copy.
   // Assumes |texture| has already been allocated with the appropriate
   // size and a compatible format, internal format and type; this is
@@ skipping 67 matching lines @@
 
   // Used for unit test.
   SkISize last_image_dimensions_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(SkCanvasVideoRenderer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_RENDERERS_SKCANVAS_VIDEO_RENDERER_H_