Fold away ImageResourceContent::ImageSize

This moves scale-handling out into the (now former) consumers of the
ImageResourceContent::ImageSize method.

Bug: 773272
Change-Id: I08760b181a48f8a5dcc5ceff68a19c67eba3601a
Reviewed-on: https://chromium-review.googlesource.com/726087
Commit-Queue: Fredrik Söderquist <fs@opera.com>
Reviewed-by: Stephen Chenney <schenney@chromium.org>
Cr-Commit-Position: refs/heads/master@{#510061}

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

@@ -86,8 +86,17 @@ void LayoutImageResource::ResetAnimation() {
 LayoutSize LayoutImageResource::ImageSize(float multiplier) const {
   if (!cached_image_)
     return LayoutSize();
-  LayoutSize size = cached_image_->ImageSize(
-      LayoutObject::ShouldRespectImageOrientation(layout_object_), multiplier);
+  LayoutSize size(cached_image_->IntrinsicSize(
+      LayoutObject::ShouldRespectImageOrientation(layout_object_)));
+  if (multiplier != 1 && !ImageHasRelativeSize()) {
+    // Don't let images that have a width/height >= 1 shrink below 1 when
+    // zoomed.
+    LayoutSize minimum_size(
+        size.Width() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit(),
+        size.Height() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit());
+    size.Scale(multiplier);
+    size.ClampToMinimumSize(minimum_size);
+  }
   if (layout_object_ && layout_object_->IsLayoutImage() && size.Width() &&
       size.Height())
     size.Scale(ToLayoutImage(layout_object_)->ImageDevicePixelRatio());

third_party/WebKit/Source/core/loader/resource/ImageResourceContent.cpp

@@ -254,26 +254,6 @@ IntSize ImageResourceContent::IntrinsicSize(
   return image_->Size();
 }
 
-LayoutSize ImageResourceContent::ImageSize(
-    RespectImageOrientationEnum should_respect_image_orientation,
-    float multiplier) {
-  if (!image_)
-    return LayoutSize();
-
-  LayoutSize size(IntrinsicSize(should_respect_image_orientation));
-
-  if (multiplier == 1 || image_->HasRelativeSize())
-    return size;
-
-  // Don't let images that have a width/height >= 1 shrink below 1 when zoomed.
-  LayoutSize minimum_size(
-      size.Width() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit(),
-      size.Height() > LayoutUnit() ? LayoutUnit(1) : LayoutUnit());
-  size.Scale(multiplier);
-  size.ClampToMinimumSize(minimum_size);
-  return size;
-}
-
 void ImageResourceContent::NotifyObservers(
     NotifyFinishOption notifying_finish_option,
     const IntRect* change_rect) {

third_party/WebKit/Source/core/loader/resource/ImageResourceContent.h

@@ -8,8 +8,6 @@
 #include <memory>
 #include "core/CoreExport.h"
 #include "platform/geometry/IntRect.h"
-#include "platform/geometry/IntSizeHash.h"
-#include "platform/geometry/LayoutSize.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/ImageOrientation.h"
@@ -81,12 +79,6 @@ class CORE_EXPORT ImageResourceContent final
   IntSize IntrinsicSize(
       RespectImageOrientationEnum should_respect_image_orientation);
 
-  // This method takes a zoom multiplier that can be used to increase the
-  // natural size of the image by the zoom.
-  LayoutSize ImageSize(
-      RespectImageOrientationEnum should_respect_image_orientation,
-      float multiplier);
-
   void UpdateImageAnimationPolicy();
 
   void AddObserver(ImageResourceObserver*);

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

@@ -90,7 +90,8 @@ LayoutSize StyleFetchedImage::ImageSize(
   // border-image, etc.)
   //
   // https://drafts.csswg.org/css-images-3/#the-image-orientation
-  return image_->ImageSize(kDoNotRespectImageOrientation, multiplier);
+  LayoutSize size(image_->IntrinsicSize(kDoNotRespectImageOrientation));
+  return ApplyZoom(size, multiplier);
 }
 
 bool StyleFetchedImage::ImageHasRelativeSize() const {

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

@@ -93,8 +93,9 @@ LayoutSize StyleFetchedImageSet::ImageSize(
   // border-image, etc.)
   //
   // https://drafts.csswg.org/css-images-3/#the-image-orientation
-  LayoutSize scaled_image_size =
-      best_fit_image_->ImageSize(kDoNotRespectImageOrientation, multiplier);
+  LayoutSize natural_size(
+      best_fit_image_->IntrinsicSize(kDoNotRespectImageOrientation));
+  LayoutSize scaled_image_size(ApplyZoom(natural_size, multiplier));
   scaled_image_size.Scale(1 / image_scale_factor_);
   return scaled_image_size;
 }

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

@@ -16,8 +16,9 @@ StyleImage::~StyleImage() {
     InstanceCounters::DecrementCounter(InstanceCounters::kUACSSResourceCounter);
 }
 
-LayoutSize StyleImage::ApplyZoom(const LayoutSize& size, float multiplier) {
-  if (multiplier == 1.0f)
+LayoutSize StyleImage::ApplyZoom(const LayoutSize& size,
+                                 float multiplier) const {
+  if (multiplier == 1.0f || ImageHasRelativeSize())
     return size;
 
   LayoutUnit width(size.Width() * multiplier);

third_party/WebKit/Source/core/style/StyleImage.h

@@ -116,7 +116,7 @@ class CORE_EXPORT StyleImage : public GarbageCollectedFinalized<StyleImage> {
 
   bool is_ua_css_resource_ = false;
 
-  static LayoutSize ApplyZoom(const LayoutSize&, float multiplier);
+  LayoutSize ApplyZoom(const LayoutSize&, float multiplier) const;
   LayoutSize ImageSizeForSVGImage(SVGImage*,
                                   float multiplier,
                                   const LayoutSize& default_object_size) const;