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 182 matching lines @@
     m_snapshotState = DrawnToAfterSnapshot;
   m_surface->didDraw(rect);
 }
 
 WebLayer* ImageBuffer::platformLayer() const {
   return m_surface->layer();
 }
 
 bool ImageBuffer::copyToPlatformTexture(SnapshotReason reason,
                                         gpu::gles2::GLES2Interface* gl,
+                                        GLenum target,
                                         GLuint texture,
-                                        GLenum internalFormat,
-                                        GLenum destType,
-                                        GLint level,
                                         bool premultiplyAlpha,
                                         bool flipY,
                                         const IntPoint& destPoint,
                                         const IntRect& sourceSubRectangle) {
-  if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(
-          GL_TEXTURE_2D, internalFormat, destType, level))
+  if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(target))
     return false;
 
   if (!isSurfaceValid())
     return false;
 
   sk_sp<const SkImage> textureImage =
       m_surface->newImageSnapshot(PreferAcceleration, reason);
   if (!textureImage)
     return false;
 
@@ skipping 30 matching lines @@
 
   GLuint sourceTexture =
       gl->CreateAndConsumeTextureCHROMIUM(textureInfo->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(
-      sourceTexture, 0, GL_TEXTURE_2D, texture, 0, destPoint.x(), destPoint.y(),
+      sourceTexture, 0, target, texture, 0, destPoint.x(), destPoint.y(),
       sourceSubRectangle.x(), sourceSubRectangle.y(),
       sourceSubRectangle.width(), sourceSubRectangle.height(),
       flipY ? GL_FALSE : GL_TRUE, GL_FALSE,
       premultiplyAlpha ? GL_FALSE : GL_TRUE);
 
   gl->DeleteTextures(1, &sourceTexture);
 
   const GLuint64 contextFenceSync = gl->InsertFenceSyncCHROMIUM();
 
   gl->Flush();
@@ skipping 23 matching lines @@
   if (!provider)
     return false;
   gpu::gles2::GLES2Interface* gl = provider->contextGL();
   GLuint textureId = m_surface->getBackingTextureHandleForOverwrite();
   if (!textureId)
     return false;
 
   gl->Flush();
 
   return drawingBuffer->copyToPlatformTexture(
-      gl, textureId, GL_RGBA, GL_UNSIGNED_BYTE, 0, true, false, IntPoint(0, 0),
+      gl, GL_TEXTURE_2D, textureId, true, false, IntPoint(0, 0),
       IntRect(IntPoint(0, 0), drawingBuffer->size()), sourceBuffer);
 }
 
 void ImageBuffer::draw(GraphicsContext& context,
                        const FloatRect& destRect,
                        const FloatRect* srcPtr,
                        SkBlendMode op) {
   if (!isSurfaceValid())
     return;
 
@@ skipping 288 matching lines @@
   DCHECK(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
 
   Vector<unsigned char> result;
   if (!encodeImage(mimeType, quality, &result))
     return "data:,";
 
   return "data:" + mimeType + ";base64," + base64Encode(result);
 }
 
 }  // namespace blink