Fold ImageResourceContent::{Uses,}Image{Container,HasRelative}Size

These methods - UsesImageContainerSize and ImageHasRelativeSize - are
only simple wrappers for similarly named methods on Image. Callers have
access to Image without any hoop-jumping, so just fold these methods.

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

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

@@ -88,6 +88,10 @@ void LayoutImageResource::ResetAnimation() {
   layout_object_->SetShouldDoFullPaintInvalidation();
 }
 
+bool LayoutImageResource::ImageHasRelativeSize() const {
+  return cached_image_ && cached_image_->GetImage()->HasRelativeSize();
+}
+
 LayoutSize LayoutImageResource::ImageSize(float multiplier) const {
   if (!cached_image_)
     return LayoutSize();

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

@@ -63,9 +63,7 @@ class CORE_EXPORT LayoutImageResource
   // the "broken image".
   void UseBrokenImage();
 
-  virtual bool ImageHasRelativeSize() const {
-    return cached_image_ ? cached_image_->ImageHasRelativeSize() : false;
-  }
+  virtual bool ImageHasRelativeSize() const;
 
   virtual LayoutSize ImageSize(float multiplier) const;
 

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

@@ -209,20 +209,6 @@ blink::Image* ImageResourceContent::GetImage() {
   return image_.get();
 }
 
-bool ImageResourceContent::UsesImageContainerSize() const {
-  if (image_)
-    return image_->UsesContainerSize();
-
-  return false;
-}
-
-bool ImageResourceContent::ImageHasRelativeSize() const {
-  if (image_)
-    return image_->HasRelativeSize();
-
-  return false;
-}
-
 IntSize ImageResourceContent::IntrinsicSize(
     RespectImageOrientationEnum should_respect_image_orientation) {
   if (!image_)

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

@@ -60,8 +60,6 @@ class CORE_EXPORT ImageResourceContent final
   blink::Image* GetImage();
   bool HasImage() const { return image_.get(); }
 
-  bool UsesImageContainerSize() const;
-  bool ImageHasRelativeSize() const;
   // The device pixel ratio we got from the server for this image, or 1.0.
   float DevicePixelRatioHeaderValue() const;
   bool HasDevicePixelRatioHeaderValue() const;

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

@@ -95,11 +95,11 @@ LayoutSize StyleFetchedImage::ImageSize(
 }
 
 bool StyleFetchedImage::ImageHasRelativeSize() const {
-  return image_->ImageHasRelativeSize();
+  return image_->GetImage()->HasRelativeSize();
 }
 
 bool StyleFetchedImage::UsesImageContainerSize() const {
-  return image_->UsesImageContainerSize();
+  return image_->GetImage()->UsesContainerSize();
 }
 
 void StyleFetchedImage::AddClient(ImageResourceObserver* observer) {

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

@@ -101,11 +101,11 @@ LayoutSize StyleFetchedImageSet::ImageSize(
 }
 
 bool StyleFetchedImageSet::ImageHasRelativeSize() const {
-  return best_fit_image_->ImageHasRelativeSize();
+  return best_fit_image_->GetImage()->HasRelativeSize();
 }
 
 bool StyleFetchedImageSet::UsesImageContainerSize() const {
-  return best_fit_image_->UsesImageContainerSize();
+  return best_fit_image_->GetImage()->UsesContainerSize();
 }
 
 void StyleFetchedImageSet::AddClient(ImageResourceObserver* observer) {