[NOT FOR COMMIT] Pass defaultObjectSize to get image size

third_party/WebKit/Source/core/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 421 matching lines @@
 
     if (!layoutObject()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int width = getAttribute(widthAttr).toInt(&ok);
         if (ok)
             return width;
 
         // if the image is available, use its width
         if (imageLoader().image())
-            return imageLoader().image()->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr), 1.0f).width();
+            return imageLoader().image()->defaultConcreteObjectSize(LayoutObject::shouldRespectImageOrientation(nullptr), 1.0f).width();
     }
 
     LayoutBox* box = layoutBox();
     return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(), box) : 0;
 }
 
 int HTMLImageElement::height()
 {
     if (inActiveDocument())
         document().updateLayoutIgnorePendingStylesheets();
 
     if (!layoutObject()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int height = getAttribute(heightAttr).toInt(&ok);
         if (ok)
             return height;
 
         // if the image is available, use its height
         if (imageLoader().image())
-            return imageLoader().image()->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr), 1.0f).height();
+            return imageLoader().image()->defaultConcreteObjectSize(LayoutObject::shouldRespectImageOrientation(nullptr), 1.0f).height();
     }
 
     LayoutBox* box = layoutBox();
     return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(), box) : 0;
 }
 
 int HTMLImageElement::naturalWidth() const
 {
     if (!imageLoader().image())
         return 0;
 
-    return imageLoader().image()->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).width();
+    return imageLoader().image()->defaultConcreteObjectSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).width();
 }
 
 int HTMLImageElement::naturalHeight() const
 {
     if (!imageLoader().image())
         return 0;
 
-    return imageLoader().image()->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).height();
+    return imageLoader().image()->defaultConcreteObjectSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).height();
 }
 
 const String& HTMLImageElement::currentSrc() const
 {
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/edits.html#dom-img-currentsrc
     // The currentSrc IDL attribute must return the img element's current request's current URL.
     // Initially, the pending request turns into current request when it is either available or broken.
     // We use the image's dimensions as a proxy to it being in any of these states.
-    if (!imageLoader().image() || !imageLoader().image()->image() || !imageLoader().image()->image()->width())
+    if (!imageLoader().image() || !imageLoader().image()->image() || !imageLoader().image()->image()->defaultConcreteObjectSizeWidth())
         return emptyAtom;
 
     return imageLoader().image()->url().string();
 }
 
 bool HTMLImageElement::isURLAttribute(const Attribute& attribute) const
 {
     return attribute.name() == srcAttr
         || attribute.name() == lowsrcAttr
         || attribute.name() == longdescAttr
@@ skipping 108 matching lines @@
     }
 
     if (cachedImage()->errorOccurred()) {
         *status = UndecodableSourceImageStatus;
         return nullptr;
     }
 
     RefPtr<Image> sourceImage;
     if (cachedImage()->image()->isSVGImage()) {
         sourceImage = SVGImageForContainer::create(toSVGImage(cachedImage()->image()),
-            cachedImage()->image()->size(), 1, document().completeURL(imageSourceURL()));
+            cachedImage()->image()->defaultConcreteObjectSize(), 1, document().completeURL(imageSourceURL()));
     } else {
         sourceImage = cachedImage()->image();
     }
 
     *status = NormalSourceImageStatus;
     return sourceImage->imageForDefaultFrame();
 }
 
 bool HTMLImageElement::isSVGSource() const
 {
     return cachedImage() && cachedImage()->image()->isSVGImage();
 }
 
 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigin) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return false;
     return !image->isAccessAllowed(destinationSecurityOrigin);
 }
 
-FloatSize HTMLImageElement::elementSize() const
+FloatSize HTMLImageElement::elementSize(const FloatSize& defaultObjectSize) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
 
-    return FloatSize(image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f));
+    return FloatSize(image->concreteObjectSize(defaultObjectSize, LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f));
 }
 
-FloatSize HTMLImageElement::defaultDestinationSize() const
+FloatSize HTMLImageElement::defaultDestinationSize(const FloatSize& defaultObjectSize) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
     LayoutSize size;
-    size = image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
+    size = image->concreteObjectSize(defaultObjectSize, LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
     if (layoutObject() && layoutObject()->isLayoutImage() && image->image() && !image->image()->hasRelativeSize())
         size.scale(toLayoutImage(layoutObject())->imageDevicePixelRatio());
     return FloatSize(size);
 }
 
 static bool sourceSizeValue(Element& element, Document& currentDocument, float& sourceSize)
 {
     String sizes = element.fastGetAttribute(sizesAttr);
     bool exists = !sizes.isNull();
     if (exists)
@@ skipping 137 matching lines @@
 {
     Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
     return image && image->currentFrameKnownToBeOpaque();
 }
 
 IntSize HTMLImageElement::bitmapSourceSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return IntSize();
-    LayoutSize lSize = image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
+    LayoutSize lSize = image->defaultConcreteObjectSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
     ASSERT(lSize.fraction().isZero());
     return IntSize(lSize.width(), lSize.height());
 }
 
 } // namespace blink