Merge image sizing algorithms

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

 /*
  * Copyright (C) 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 75 matching lines @@
 bool StyleFetchedImageSet::isLoaded() const
 {
     return m_bestFitImage->isLoaded();
 }
 
 bool StyleFetchedImageSet::errorOccurred() const
 {
     return m_bestFitImage->errorOccurred();
 }
 
-LayoutSize StyleFetchedImageSet::imageSize(const LayoutObject* layoutObject, float multiplier) const
+LayoutSize StyleFetchedImageSet::imageSize(const LayoutObject* layoutObject, float multiplier, const LayoutSize& defaultObjectSize) const
 {
-    LayoutSize scaledImageSize = m_bestFitImage->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject), multiplier);
-    scaledImageSize.scale(1 / m_imageScaleFactor);
-    return scaledImageSize;
+    if (m_bestFitImage->image() && m_bestFitImage->image()->isSVGImage()) {
+        FloatSize unzoomedDefaultObjectSize(defaultObjectSize);
+        unzoomedDefaultObjectSize.scale(1 / multiplier);
+        LayoutSize concreteObjectSize(toSVGImage(m_bestFitImage->image())->calculateConcreteObjectSize(unzoomedDefaultObjectSize));
+
+        // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
+        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 (backgrounds, border-image,
+    // etc.)
+    const RespectImageOrientationEnum shouldRespectImageOrientation = DoNotRespectImageOrientation;

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

Same as above.

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

Done.

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