[ImageResource 4] Split ImageResource into Resource and Image parts

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

Index: third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
diff --git a/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h b/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
index 0ed7ee36a7bdd7b599b5b8ccc1d2ac463c70fb34..6d04c60383d9f345b315547821b3aa822d7237e6 100644
--- a/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
+++ b/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
@@ -33,7 +33,6 @@
 
 namespace blink {
 
-class ImageResource;
 class CSSImageSetValue;
 
 // This class keeps one cached image and has access to a set of alternatives.
@@ -43,7 +42,7 @@ class StyleFetchedImageSet final : public StyleImage,
   USING_PRE_FINALIZER(StyleFetchedImageSet, dispose);
 
  public:
-  static StyleFetchedImageSet* create(ImageResource* image,
+  static StyleFetchedImageSet* create(ImageResourceContent* image,
                                       float imageScaleFactor,
                                       CSSImageSetValue* value,
                                       const KURL& url) {
@@ -74,12 +73,12 @@ class StyleFetchedImageSet final : public StyleImage,
                           float) const override;
   float imageScaleFactor() const override { return m_imageScaleFactor; }
   bool knownToBeOpaque(const LayoutObject&) const override;
-  ImageResource* cachedImage() const override;
+  ImageResourceContent* cachedImage() const override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
-  StyleFetchedImageSet(ImageResource*,
+  StyleFetchedImageSet(ImageResourceContent*,
                        float imageScaleFactor,
                        CSSImageSetValue*,
                        const KURL&);
@@ -88,7 +87,7 @@ class StyleFetchedImageSet final : public StyleImage,
 
   String debugName() const override { return "StyleFetchedImageSet"; }
 
-  Member<ImageResource> m_bestFitImage;
+  Member<ImageResourceContent> m_bestFitImage;
   float m_imageScaleFactor;
 
   Member<CSSImageSetValue> m_imageSetValue;  // Not retained; it owns us.