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())
+        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
 {
     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