Enable CopyTextureCHROMIUM in Blink for Tex{Sub}Image2D with more cases

third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. 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
@@ skipping 201 matching lines @@
     snapshot_state_ = kDrawnToAfterSnapshot;
   surface_->DidDraw(rect);
 }
 
 WebLayer* ImageBuffer::PlatformLayer() const {
   return surface_->Layer();
 }
 
 bool ImageBuffer::CopyToPlatformTexture(SnapshotReason reason,
                                         gpu::gles2::GLES2Interface* gl,
+                                        GLenum target,
                                         GLuint texture,
-                                        GLenum internal_format,
-                                        GLenum dest_type,
-                                        GLint level,
                                         bool premultiply_alpha,
                                         bool flip_y,
                                         const IntPoint& dest_point,
                                         const IntRect& source_sub_rectangle) {
-  if (!Extensions3DUtil::CanUseCopyTextureCHROMIUM(
-          GL_TEXTURE_2D, internal_format, dest_type, level))
+  if (!Extensions3DUtil::CanUseCopyTextureCHROMIUM(target))
     return false;
 
   if (!IsSurfaceValid())
     return false;
 
   sk_sp<const SkImage> texture_image =
       surface_->NewImageSnapshot(kPreferAcceleration, reason);
   if (!texture_image)
     return false;
 
@@ skipping 31 matching lines @@
 
   GLuint source_texture =
       gl->CreateAndConsumeTextureCHROMIUM(texture_info->fTarget, mailbox.name);
 
   // The canvas is stored in a premultiplied format, so unpremultiply if
   // necessary. The canvas is also stored in an inverted position, so the flip
   // semantics are reversed.
   // It is expected that callers of this method have already allocated
   // the platform texture with the appropriate size.
   gl->CopySubTextureCHROMIUM(
-      source_texture, 0, GL_TEXTURE_2D, texture, 0, dest_point.X(),
-      dest_point.Y(), source_sub_rectangle.X(), source_sub_rectangle.Y(),
+      source_texture, 0, target, texture, 0, dest_point.X(), dest_point.Y(),
+      source_sub_rectangle.X(), source_sub_rectangle.Y(),
       source_sub_rectangle.Width(), source_sub_rectangle.Height(),
       flip_y ? GL_FALSE : GL_TRUE, GL_FALSE,
       premultiply_alpha ? GL_FALSE : GL_TRUE);
 
   gl->DeleteTextures(1, &source_texture);
 
   const GLuint64 context_fence_sync = gl->InsertFenceSyncCHROMIUM();
 
   gl->Flush();
 
@@ skipping 23 matching lines @@
   if (!provider)
     return false;
   gpu::gles2::GLES2Interface* gl = provider->ContextGL();
   GLuint texture_id = surface_->GetBackingTextureHandleForOverwrite();
   if (!texture_id)
     return false;
 
   gl->Flush();
 
   return drawing_buffer->CopyToPlatformTexture(
-      gl, texture_id, GL_RGBA, GL_UNSIGNED_BYTE, 0, true, false, IntPoint(0, 0),
+      gl, GL_TEXTURE_2D, texture_id, true, false, IntPoint(0, 0),
       IntRect(IntPoint(0, 0), drawing_buffer->size()), source_buffer);
 }
 
 void ImageBuffer::Draw(GraphicsContext& context,
                        const FloatRect& dest_rect,
                        const FloatRect* src_ptr,
                        SkBlendMode op) {
   if (!IsSurfaceValid())
     return;
 
@@ skipping 284 matching lines @@
   DCHECK(MIMETypeRegistry::IsSupportedImageMIMETypeForEncoding(mime_type));
 
   Vector<unsigned char> result;
   if (!EncodeImage(mime_type, quality, &result))
     return "data:,";
 
   return "data:" + mime_type + ";base64," + Base64Encode(result);
 }
 
 }  // namespace blink