Merge image sizing algorithms

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

Index: third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
diff --git a/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp b/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
index f2e15b31e4c114262515a4a8c346468200ea4352..f28bef72d82cfdf99b8b27ea925de8edf521c656 100644
--- a/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
+++ b/third_party/WebKit/Source/core/style/StyleFetchedImage.cpp
@@ -91,9 +91,15 @@ 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())
+        return imageSizeForSVGImage(toSVGImage(m_image->image()), multiplier, defaultObjectSize);
+
+    // Image orientation should only be respected for content images,
+    // not decorative images such as StyleImage (backgrounds,
+    // border-image, etc.)

[Yoav Weiss, 2016/03/07 11:16:07]

Could you point to a spec indicating that this is the right behavior? Do we have
tests that cover that behavior change?

[davve, 2016/03/07 13:07:38]

https://drafts.csswg.org/css-images-3/#the-image-orientation

" ... This property specifies an orthogonal rotation to be applied to an image
before it is laid out. It applies only to content images (e.g. replaced elements
and generated content), not decorative images (such as background-image)."

fast/images/exif-orientation-css.html tests background-image, but other
decorative images not covered well, AFAIK.

+    return m_image->imageSize(DoNotRespectImageOrientation, multiplier);
 }
 
 bool StyleFetchedImage::imageHasRelativeSize() const