[ImageResource 4] Split ImageResource into Resource and Image parts

third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp

Index: third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
diff --git a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
index 7f75fae7f98bbf972e808b5fab7c96e7c0313a80..72654f67412cd5f6c193d0fe322b2810306d7c55 100644
--- a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
@@ -59,8 +59,8 @@ static bool subimageKnownToBeOpaque(CSSValue* value,
   return false;
 }
 
-static ImageResource* cachedImageForCSSValue(CSSValue* value,
-                                             const Document& document) {
+static ImageResourceContent* cachedImageForCSSValue(CSSValue* value,
+                                                    const Document& document) {
   if (!value)
     return nullptr;
 
@@ -87,7 +87,7 @@ static ImageResource* cachedImageForCSSValue(CSSValue* value,
 
 static Image* renderableImageForCSSValue(CSSValue* value,
                                          const LayoutObject& layoutObject) {
-  ImageResource* cachedImage =
+  ImageResourceContent* cachedImage =
       cachedImageForCSSValue(value, layoutObject.document());
 
   if (!cachedImage || cachedImage->errorOccurred() ||
@@ -199,8 +199,8 @@ bool CSSCrossfadeValue::knownToBeOpaque(
 }
 
 void CSSCrossfadeValue::loadSubimages(const Document& document) {
-  ImageResource* oldCachedFromImage = m_cachedFromImage;
-  ImageResource* oldCachedToImage = m_cachedToImage;
+  ImageResourceContent* oldCachedFromImage = m_cachedFromImage;
+  ImageResourceContent* oldCachedToImage = m_cachedToImage;
 
   m_cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
   m_cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
@@ -266,7 +266,7 @@ bool CSSCrossfadeValue::willRenderImage() const {
 }
 
 void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(
-    ImageResource*,
+    ImageResourceContent*,
     const IntRect* rect) {
   if (m_ready)
     m_ownerValue->crossfadeChanged(*rect);