Rename imageSizeForLayoutObject() to imageSize()

third_party/WebKit/Source/core/layout/LayoutImageResource.cpp

 /*
  * Copyright (C) 1999 Lars Knoll <knoll@kde.org>
  * Copyright (C) 1999 Antti Koivisto <koivisto@kde.org>
  * Copyright (C) 2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2006 Allan Sandfeld Jensen <kde@carewolf.com>
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2010 Patrick Gansterer <paroga@paroga.com>
  *
@@ skipping 76 matching lines @@
 
     m_cachedImage->image()->resetAnimation();
 
     m_layoutObject->setShouldDoFullPaintInvalidation();
 }
 
 LayoutSize LayoutImageResource::imageSize(float multiplier) const
 {
     if (!m_cachedImage)
         return LayoutSize();
-    LayoutSize size = m_cachedImage->imageSizeForLayoutObject(m_layoutObject, multiplier);
+    RespectImageOrientationEnum shouldRespectImageOrientation =
+        m_layoutObject ? m_layoutObject->shouldRespectImageOrientation() : DoNotRespectImageOrientation;
+    LayoutSize size = m_cachedImage->imageSize(shouldRespectImageOrientation, multiplier);

[Yoav Weiss, 2015/11/24 10:29:07]

This repetition of the shouldRespectImageOrientation logic is not needed. You
could replace it with `shouldRespectImageOrientation(m_layoutObject)`

[davve, 2015/11/24 12:49:13]

Having such a global function has struck my mind, yes. I haven't any yet, but I
could of course make one.

[Yoav Weiss, 2015/11/24 13:06:56]

Can you just call shouldRespectImageOrientation() for that purpose?

     if (m_layoutObject && m_layoutObject->isLayoutImage() && size.width() && size.height())
         size.scale(toLayoutImage(m_layoutObject)->imageDevicePixelRatio());
     return size;
 }
 
 PassRefPtr<Image> LayoutImageResource::image(const IntSize& containerSize, float zoom) const
 {
     RefPtr<Image> image = m_cachedImage ? m_cachedImage->image() : Image::nullImage();
     if (image->isSVGImage()) {
         KURL url;
         SVGImage* svgImage = toSVGImage(image.get());
         Node* node = m_layoutObject->node();
         if (node && node->isElementNode()) {
             const AtomicString& urlString = toElement(node)->imageSourceURL();
             url = node->document().completeURL(urlString);
         }
         return SVGImageForContainer::create(svgImage, containerSize, zoom, url);
     }
     return image;
 }
 
 bool LayoutImageResource::maybeAnimated() const
 {
     Image* image = m_cachedImage ? m_cachedImage->image() : Image::nullImage();
     return image->maybeAnimated();
 }
 
 } // namespace blink