Merge image sizing algorithms

third_party/WebKit/Source/core/style/StyleFetchedImage.cpp

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 73 matching lines @@
 bool StyleFetchedImage::isLoaded() const
 {
     return m_image->isLoaded();
 }
 
 bool StyleFetchedImage::errorOccurred() const
 {
     return m_image->errorOccurred();
 }
 
-LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier) const
+LayoutSize StyleFetchedImage::imageSize(const LayoutObject* layoutObject, float multiplier, const LayoutSize& defaultObjectSize) const
 {
-    return m_image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject), multiplier);
+    if (m_image->image() && m_image->image()->isSVGImage()) {
+        FloatSize unzoomedDefaultObjectSize(defaultObjectSize);
+        unzoomedDefaultObjectSize.scale(1 / multiplier);
+        LayoutSize concreteObjectSize(toSVGImage(m_image->image())->calculateConcreteObjectSize(unzoomedDefaultObjectSize));
+
+        // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.

[fs, 2016/03/03 15:22:53]

Maybe we could put this sequence as a helper on StyleImage or something like
that. (Hmm, maybe the whole block even...)

[davve, 2016/03/04 06:49:43]

Yes, that probably good. Even prior to this, there are some really good code
sharing opportunities between StyleFetchedImage and StyleFetchedImageSet.

+        LayoutSize minimumSize(concreteObjectSize.width() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit(),
+            concreteObjectSize.height() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit());
+        concreteObjectSize.scale(multiplier);
+        concreteObjectSize.clampToMinimumSize(minimumSize);
+        return concreteObjectSize;
+    }
+
+    // Image orientation should only be respected for content images,
+    // not decorative ones as StyleImage carries (backgrounds,
+    // border-image, etc.)
+    const RespectImageOrientationEnum shouldRespectImageOrientation = DoNotRespectImageOrientation;

[fs, 2016/03/03 15:22:53]

Nit: Fold this into the call? (Comment alone seems sufficient to notice this?
Unless I'm missing something...)

[davve, 2016/03/04 06:49:43]

Done.

+
+    return m_image->imageSize(shouldRespectImageOrientation, multiplier);
 }
 
 bool StyleFetchedImage::imageHasRelativeSize() const
 {
     return m_image->imageHasRelativeSize();
 }
 
 void StyleFetchedImage::computeIntrinsicDimensions(const LayoutObject*, FloatSize& intrinsicSize, FloatSize& intrinsicRatio)
 {
     m_image->computeIntrinsicDimensions(intrinsicSize, intrinsicRatio);
@@ skipping 37 matching lines @@
 }
 
 DEFINE_TRACE(StyleFetchedImage)
 {
     visitor->trace(m_image);
     visitor->trace(m_document);
     StyleImage::trace(visitor);
 }
 
 } // namespace blink