| Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| index a376b6c1e45025880a6e39a082736ecacc529a4a..bf9e3d67d78220a27cfc3efd6cd3f5754f9d9c8a 100644
|
| --- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| +++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
|
| @@ -4518,7 +4518,9 @@ void WebGLRenderingContextBase::texImageHelperImageBitmap(TexImageFunctionID fun
|
| return;
|
| ASSERT(bitmap->bitmapImage());
|
|
|
| + fprintf(stderr, "uploading to texture, before calling isTextureBacked()\n");
|
| if (functionID != TexSubImage3D && bitmap->isTextureBacked() && canUseTexImageByGPU(functionID, internalformat, type)) {
|
| + fprintf(stderr, "done calling isTextureBacked()\n");
|
| if (functionID == TexImage2D) {
|
| texImage2DBase(target, level, internalformat, bitmap->width(), bitmap->height(), 0, format, type, 0);
|
| texImageByGPU(TexImage2DByGPU, texture, target, level, internalformat, type, 0, 0, 0, bitmap);
|
| @@ -4529,7 +4531,6 @@ void WebGLRenderingContextBase::texImageHelperImageBitmap(TexImageFunctionID fun
|
| }
|
| RefPtr<SkImage> skImage = bitmap->bitmapImage()->imageForCurrentFrame();
|
| SkPixmap pixmap;
|
| - std::unique_ptr<uint8_t[]> pixelData;
|
| uint8_t* pixelDataPtr = nullptr;
|
| // In the case where an ImageBitmap is not texture backed, peekPixels() always succeed.
|
| // However, when it is texture backed and !canUseTexImageByGPU, we do a GPU read back.
|
| @@ -4537,8 +4538,7 @@ void WebGLRenderingContextBase::texImageHelperImageBitmap(TexImageFunctionID fun
|
| if (peekSucceed) {
|
| pixelDataPtr = static_cast<uint8_t*>(pixmap.writable_addr());
|
| } else {
|
| - pixelData = bitmap->copyBitmapData(bitmap->isPremultiplied() ? PremultiplyAlpha : DontPremultiplyAlpha);
|
| - pixelDataPtr = pixelData.get();
|
| + pixelDataPtr = bitmap->copyBitmapData(bitmap->isPremultiplied() ? PremultiplyAlpha : DontPremultiplyAlpha).leakRef()->data();
|
| }
|
| Vector<uint8_t> data;
|
| bool needConversion = true;
|
|
|