| Index: third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
|
| index 38849d9937831680cd1affa8a12408eaea61b1cb..773676ed9717c0a3dc501186b2055f4a04af4adc 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp
|
| @@ -2133,7 +2133,7 @@ void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, b
|
|
|
| RefPtr<SkImage> skiaImage = m_image->imageForCurrentFrame();
|
| SkImageInfo info = skiaImage
|
| - ? SkImageInfo::MakeN32Premul(m_image->width(), m_image->height())
|
| + ? SkImageInfo::MakeN32Premul(m_image->defaultConcreteObjectSizeWidth(), m_image->defaultConcreteObjectSizeHeight())
|
| : SkImageInfo::MakeUnknown();
|
| m_alphaOp = AlphaDoNothing;
|
| bool hasAlpha = skiaImage ? !skiaImage->isOpaque() : true;
|
| @@ -2185,7 +2185,7 @@ void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, b
|
| m_imageHeight = skiaImage->height();
|
|
|
| // Fail if the image was downsampled because of memory limits.
|
| - if (m_imageWidth != (unsigned)m_image->width() || m_imageHeight != (unsigned)m_image->height())
|
| + if (m_imageWidth != (unsigned)m_image->defaultConcreteObjectSizeWidth() || m_imageHeight != (unsigned)m_image->defaultConcreteObjectSizeHeight())
|
| return;
|
|
|
| m_imagePixelLocker.emplace(skiaImage, info.alphaType());
|
|
|