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

third_party/WebKit/Source/platform/graphics/gpu/DrawingBuffer.cpp

 /*
  * Copyright (c) 2010, 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 665 matching lines @@
   if (m_gl->GetGraphicsResetStatusKHR() != GL_NO_ERROR) {
     // It's possible that the drawing buffer allocation provokes a context loss,
     // so check again just in case. http://crbug.com/512302
     return false;
   }
 
   return true;
 }
 
 bool DrawingBuffer::copyToPlatformTexture(gpu::gles2::GLES2Interface* gl,
+                                          GLenum textureTarget,
                                           GLuint texture,
-                                          GLenum internalFormat,
-                                          GLenum destType,
-                                          GLint level,
                                           bool premultiplyAlpha,
                                           bool flipY,
                                           const IntPoint& destTextureOffset,
                                           const IntRect& sourceSubRectangle,
                                           SourceDrawingBuffer sourceBuffer) {
   ScopedStateRestorer scopedStateRestorer(this);
 
   if (m_contentsChanged) {
     if (m_antiAliasingMode != None)
       resolveMultisampleFramebufferInternal();
     m_gl->Flush();
   }
 
-  // Assume that the destination target is GL_TEXTURE_2D.
-  if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(
-          GL_TEXTURE_2D, internalFormat, destType, level))
+  if (!Extensions3DUtil::canUseCopyTextureCHROMIUM(textureTarget))
     return false;
 
   // Contexts may be in a different share group. We must transfer the texture
   // through a mailbox first.
   GLenum target = 0;
   gpu::Mailbox mailbox;
   gpu::SyncToken produceSyncToken;
   if (sourceBuffer == FrontBuffer && m_frontColorBuffer) {
     target = m_frontColorBuffer->parameters.target;
     mailbox = m_frontColorBuffer->mailbox;
@@ skipping 18 matching lines @@
       gl->CreateAndConsumeTextureCHROMIUM(target, mailbox.name);
 
   GLboolean unpackPremultiplyAlphaNeeded = GL_FALSE;
   GLboolean unpackUnpremultiplyAlphaNeeded = GL_FALSE;
   if (m_wantAlphaChannel && m_premultipliedAlpha && !premultiplyAlpha)
     unpackUnpremultiplyAlphaNeeded = GL_TRUE;
   else if (m_wantAlphaChannel && !m_premultipliedAlpha && premultiplyAlpha)
     unpackPremultiplyAlphaNeeded = GL_TRUE;
 
   gl->CopySubTextureCHROMIUM(
-      sourceTexture, 0, GL_TEXTURE_2D, texture, 0, destTextureOffset.x(),
+      sourceTexture, 0, textureTarget, texture, 0, destTextureOffset.x(),
       destTextureOffset.y(), sourceSubRectangle.x(), sourceSubRectangle.y(),
       sourceSubRectangle.width(), sourceSubRectangle.height(), flipY,
       unpackPremultiplyAlphaNeeded, unpackUnpremultiplyAlphaNeeded);
 
   gl->DeleteTextures(1, &sourceTexture);
 
   const GLuint64 fenceSync = gl->InsertFenceSyncCHROMIUM();
 
   gl->Flush();
   gpu::SyncToken syncToken;
@@ skipping 537 matching lines @@
   if (m_pixelUnpackBufferBindingDirty)
     client->DrawingBufferClientRestorePixelUnpackBufferBinding();
 }
 
 bool DrawingBuffer::shouldUseChromiumImage() {
   return RuntimeEnabledFeatures::webGLImageChromiumEnabled() &&
          m_chromiumImageUsage == AllowChromiumImage;
 }
 
 }  // namespace blink