Fix WebGL tex-image-and-sub-image-2d-with-video-rgb{565,4444,5551} tests on Android.

Source/core/html/canvas/WebGLRenderingContextBase.cpp

 /*
  * Copyright (C) 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 3909 matching lines @@
     GLenum format, GLenum type, HTMLVideoElement* video, ExceptionState& exceptionState)
 {
     if (isContextLost() || !validateHTMLVideoElement("texImage2D", video, exceptionState)
         || !validateTexFunc("texImage2D", NotTexSubImage2D, SourceHTMLVideoElement, target, level, internalformat, video->videoWidth(), video->videoHeight(), 0, format, type, 0, 0))
         return;
 
     // Go through the fast path doing a GPU-GPU textures copy without a readback to system memory if possible.
     // Otherwise, it will fall back to the normal SW path.
     WebGLTexture* texture = validateTextureBinding("texImage2D", target, true);
     ASSERT(texture);
-    if (Extensions3DUtil::canUseCopyTextureCHROMIUM(target, internalformat, type, level)) {
-        if (video->copyVideoTextureToPlatformTexture(webContext(), texture->object(), internalformat, type, m_unpackPremultiplyAlpha, m_unpackFlipY)) {
+    if (GL_TEXTURE_2D == target) {

[Sami, 2015/06/19 06:15:58]

I assume the intention is that we want to try using the secondary YUV conversion
path for all TEXTURE_2D video textures instead of just ones that support
copyVideoTextureToPlatformTexture? Any idea why the software fallback wasn't
working?

+        if (Extensions3DUtil::canUseCopyTextureCHROMIUM(target, internalformat, type, level)
+            && video->copyVideoTextureToPlatformTexture(webContext(), texture->object(), internalformat, type, m_unpackPremultiplyAlpha, m_unpackFlipY)) {
             texture->setLevelInfo(target, level, internalformat, video->videoWidth(), video->videoHeight(), 1, type);
             return;
         }
 
         // Try using an accelerated image buffer, this allows YUV conversion to be done on the GPU.
         OwnPtr<ImageBufferSurface> surface = adoptPtr(new AcceleratedImageBufferSurface(IntSize(video->videoWidth(), video->videoHeight())));
         if (surface->isValid()) {
             OwnPtr<ImageBuffer> imageBuffer(ImageBuffer::create(surface.release()));
             if (imageBuffer) {
                 // The video element paints an RGBA frame into our surface here. By using an AcceleratedImageBufferSurface,
                 // we enable the WebMediaPlayer implementation to do any necessary color space conversion on the GPU (though it
                 // may still do a CPU conversion and upload the results).
                 video->paintCurrentFrame(imageBuffer->canvas(), IntRect(0, 0, video->videoWidth(), video->videoHeight()), nullptr);
                 imageBuffer->canvas()->flush();
 
                 // This is a straight GPU-GPU copy, any necessary color space conversion was handled in the paintCurrentFrameInContext() call.
                 if (imageBuffer->copyToPlatformTexture(webContext(), texture->object(), internalformat, type,

[dshwang, 2015/06/22 11:44:17]

Thank you for fixing the bug I created.
I couldn't understand how this change fixes the bug because this line is
supposed to fail if "Extensions3DUtil::canUseCopyTextureCHROMIUM" return 
|false|.
I think software fallback always goes through if
"Extensions3DUtil::canUseCopyTextureCHROMIUM" return 
|false|, no matter this CL.
The only difference between this CL and previous is that this CL make code try
to go through hardware path and fail and then try software fallback. Trying
hardware path makes some difference (side effect). I feel root bug is still
there.

                     level, m_unpackPremultiplyAlpha, m_unpackFlipY)) {
                     texture->setLevelInfo(target, level, internalformat, video->videoWidth(), video->videoHeight(), 1, type);
                     return;
                 }
             }
         }
     }
 
     // Normal pure SW path.
     RefPtr<Image> image = videoFrameToImage(video, ImageBuffer::fastCopyImageMode());
@@ skipping 2256 matching lines @@
 
     return totalBytesPerPixel;
 }
 
 DrawingBuffer* WebGLRenderingContextBase::drawingBuffer() const
 {
     return m_drawingBuffer.get();
 }
 
 } // namespace blink