[NOT FOR COMMIT] Pass defaultObjectSize to get image size

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 
 #include "platform/CheckedInt.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/cpu/arm/WebGLImageConversionNEON.h"
 #include "platform/graphics/cpu/x86/WebGLImageConversionSSE.h"
@@ skipping 2115 matching lines @@
 
 void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, bool ignoreGammaAndColorProfile)
 {
     ASSERT(!m_imagePixelLocker);
 
     if (!m_image)
         return;
 
     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;
 
     if ((!skiaImage || ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && m_image->data()) {
         // Attempt to get raw unpremultiplied image data.
         OwnPtr<ImageDecoder> decoder(ImageDecoder::create(
             *(m_image->data()), ImageDecoder::AlphaNotPremultiplied,
             ignoreGammaAndColorProfile ? ImageDecoder::GammaAndColorProfileIgnored : ImageDecoder::GammaAndColorProfileApplied));
         if (!decoder)
@@ skipping 31 matching lines @@
         return;
 
     m_imageSourceFormat = SK_B32_SHIFT ? DataFormatRGBA8 : DataFormatBGRA8;
     m_imageSourceUnpackAlignment = 0; // FIXME: this seems to always be zero - why use at all?
 
     ASSERT(skiaImage->width() && skiaImage->height());
     m_imageWidth = skiaImage->width();
     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());
 }
 
 unsigned WebGLImageConversion::getChannelBitsByFormat(GLenum format)
 {
     switch (format) {
     case GL_ALPHA:
         return ChannelAlpha;
@@ skipping 204 matching lines @@
     }
 
     FormatConverter converter(width, height, sourceData, destinationData, srcStride, dstStride);
     converter.convert(sourceDataFormat, dstDataFormat, alphaOp);
     if (!converter.Success())
         return false;
     return true;
 }
 
 } // namespace blink