[NOT FOR COMMIT] Pass defaultObjectSize to get image size

third_party/WebKit/Source/core/fetch/ImageResource.cpp

 /*
     Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de)
     Copyright (C) 2001 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Waldo Bastian (bastian@kde.org)
     Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
     Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
@@ skipping 193 matching lines @@
 }
 
 bool ImageResource::imageHasRelativeSize() const
 {
     if (m_image)
         return m_image->hasRelativeSize();
 
     return false;
 }
 
-LayoutSize ImageResource::imageSize(RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType sizeType)
+LayoutSize ImageResource::concreteObjectSize(const FloatSize& defaultObjectSize, RespectImageOrientationEnum shouldRespectImageOrientation, float multiplier, SizeType sizeType)
 {
     ASSERT(!isPurgeable());
 
     if (!m_image)
         return LayoutSize();
 
     LayoutSize size;
 
     if (m_image->isBitmapImage() && shouldRespectImageOrientation == RespectImageOrientation)
         size = LayoutSize(toBitmapImage(m_image.get())->sizeRespectingOrientation());
     else
-        size = LayoutSize(m_image->size());
+        size = LayoutSize(m_image->concreteObjectSize(defaultObjectSize));
 
     if (sizeType == IntrinsicCorrectedToDPR && m_hasDevicePixelRatioHeaderValue && m_devicePixelRatioHeaderValue > 0)
         multiplier = 1 / m_devicePixelRatioHeaderValue;
 
     if (multiplier == 1 || m_image->hasRelativeSize())
         return size;
 
     // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
     LayoutSize minimumSize(size.width() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit(),
         LayoutUnit(size.height() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit()));
@@ skipping 227 matching lines @@
         return true;
     return !securityOrigin->taintsCanvas(response().url());
 }
 
 bool ImageResource::loadingMultipartContent() const
 {
     return m_loader && m_loader->loadingMultipartContent();
 }
 
 } // namespace blink