[NOT FOR COMMIT] Pass defaultObjectSize to get image size

third_party/WebKit/Source/core/frame/ImageBitmap.cpp

 // Copyright 2013 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 "core/frame/ImageBitmap.h"
 
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
 #include "platform/image-decoders/ImageDecoder.h"
@@ skipping 72 matching lines @@
 {
     SkImageInfo info = SkImageInfo::Make(input->width(), input->height(), kN32_SkColorType, kUnpremul_SkAlphaType);
     OwnPtr<uint8_t[]> dstPixels = copySkImageData(input, info);
     return newSkImageFromRaster(info, dstPixels.release(), input->width() * info.bytesPerPixel());
 }
 
 static PassRefPtr<StaticBitmapImage> cropImage(Image* image, const IntRect& cropRect, bool flipYEnabled, bool premultiplyAlphaEnabled)
 {
     ASSERT(image);
 
-    IntRect imgRect(IntPoint(), IntSize(image->width(), image->height()));
+    IntRect imgRect(IntPoint(), IntSize(image->defaultConcreteObjectSizeWidth(), image->defaultConcreteObjectSizeHeight()));
     const IntRect srcRect = intersection(imgRect, cropRect);
 
     RefPtr<SkImage> skiaImage = image->imageForCurrentFrame();
     // Attempt to get raw unpremultiplied image data.
     if (((!premultiplyAlphaEnabled && !skiaImage->isOpaque()) || !skiaImage) && image->data()) {
         // TODO(xidachen): GammaAndColorProfileApplied needs to be changed when working on color-space conversion
         OwnPtr<ImageDecoder> decoder(ImageDecoder::create(
             *(image->data()), ImageDecoder::AlphaNotPremultiplied,
             ImageDecoder::GammaAndColorProfileApplied));
         if (!decoder)
@@ skipping 205 matching lines @@
 {
     SkImageInfo info = SkImageInfo::Make(width(), height(), kRGBA_8888_SkColorType, (alphaOp == PremultiplyAlpha) ? kPremul_SkAlphaType : kUnpremul_SkAlphaType);
     OwnPtr<uint8_t[]> dstPixels = copySkImageData(m_image->imageForCurrentFrame().get(), info);
     return dstPixels.release();
 }
 
 unsigned long ImageBitmap::width() const
 {
     if (!m_image)
         return 0;
-    ASSERT(m_image->width() > 0);
-    return m_image->width();
+    ASSERT(m_image->defaultConcreteObjectSizeWidth() > 0);
+    return m_image->defaultConcreteObjectSizeWidth();
 }
 
 unsigned long ImageBitmap::height() const
 {
     if (!m_image)
         return 0;
-    ASSERT(m_image->height() > 0);
-    return m_image->height();
+    ASSERT(m_image->defaultConcreteObjectSizeHeight() > 0);
+    return m_image->defaultConcreteObjectSizeHeight();
 }
 
 IntSize ImageBitmap::size() const
 {
     if (!m_image)
         return IntSize();
-    ASSERT(m_image->width() > 0 && m_image->height() > 0);
-    return IntSize(m_image->width(), m_image->height());
+    ASSERT(m_image->defaultConcreteObjectSizeWidth() > 0 && m_image->defaultConcreteObjectSizeHeight() > 0);
+    return IntSize(m_image->defaultConcreteObjectSizeWidth(), m_image->defaultConcreteObjectSizeHeight());
 }
 
 ScriptPromise ImageBitmap::createImageBitmap(ScriptState* scriptState, EventTarget& eventTarget, int sx, int sy, int sw, int sh, const ImageBitmapOptions& options, ExceptionState& exceptionState)
 {
     if (!sw || !sh) {
         exceptionState.throwDOMException(IndexSizeError, String::format("The source %s provided is 0.", sw ? "height" : "width"));
         return ScriptPromise();
     }
     return ImageBitmapSource::fulfillImageBitmap(scriptState, create(this, IntRect(sx, sy, sw, sh), options));
 }
 
 void ImageBitmap::notifyImageSourceChanged()
 {
 }
 
 PassRefPtr<Image> ImageBitmap::getSourceImageForCanvas(SourceImageStatus* status, AccelerationHint, SnapshotReason) const
 {
     *status = NormalSourceImageStatus;
     return m_image ? m_image : nullptr;
 }
 
 void ImageBitmap::adjustDrawRects(FloatRect* srcRect, FloatRect* dstRect) const
 {
 }
 
-FloatSize ImageBitmap::elementSize() const
+FloatSize ImageBitmap::elementSize(const FloatSize&) const
 {
     return FloatSize(width(), height());
 }
 
 DEFINE_TRACE(ImageBitmap)
 {
     ImageLoaderClient::trace(visitor);
 }
 
 } // namespace blink