Revert of "webgl: optimize webgl.texSubImage2D(video) path."

third_party/WebKit/Source/core/html/HTMLVideoElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 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 188 matching lines @@
         return;
 
     SkXfermode::Mode mode;
     if (!paint || !SkXfermode::AsMode(paint->getXfermode(), &mode))
         mode = SkXfermode::kSrcOver_Mode;
 
     // TODO(junov, philipj): crbug.com/456529 Pass the whole SkPaint instead of only alpha and xfermode
     webMediaPlayer()->paint(canvas, destRect, paint ? paint->getAlpha() : 0xFF, mode);
 }
 
-bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* context, const WebMediaPlayer::CopyVideoTextureParams& params)
+bool HTMLVideoElement::copyVideoTextureToPlatformTexture(WebGraphicsContext3D* context, Platform3DObject texture, GLenum internalFormat, GLenum type, bool premultiplyAlpha, bool flipY)
 {
     if (!webMediaPlayer())
         return false;
 
-    ASSERT(Extensions3DUtil::canUseCopyTextureCHROMIUM(params.target,
-        params.copyType == WebMediaPlayer::CopyVideoTextureParams::SubCopy ? GL_RGBA : params.internalFormat,
-        params.copyType == WebMediaPlayer::CopyVideoTextureParams::SubCopy ? GL_UNSIGNED_BYTE : params.type,
-        params.level));
-    return webMediaPlayer()->copyVideoTextureToPlatformTexture(context, params);
+    ASSERT(Extensions3DUtil::canUseCopyTextureCHROMIUM(GL_TEXTURE_2D, internalFormat, type, 0));
+    return webMediaPlayer()->copyVideoTextureToPlatformTexture(context, texture, internalFormat, type, premultiplyAlpha, flipY);
 }
 
 bool HTMLVideoElement::hasAvailableVideoFrame() const
 {
     if (!webMediaPlayer())
         return false;
 
     return webMediaPlayer()->hasVideo() && webMediaPlayer()->readyState() >= WebMediaPlayer::ReadyStateHaveCurrentData;
 }
 
@@ skipping 88 matching lines @@
 {
     return !isMediaDataCORSSameOrigin(destinationSecurityOrigin);
 }
 
 FloatSize HTMLVideoElement::elementSize() const
 {
     return FloatSize(videoWidth(), videoHeight());
 }
 
 } // namespace blink