[ImageResource 4] Split ImageResource into Resource and Image parts

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

 /*
  * Copyright (C) 2011 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 41 matching lines @@
     return toCSSImageValue(value)->knownToBeOpaque(layoutObject);
 
   if (value->isImageGeneratorValue())
     return toCSSImageGeneratorValue(value)->knownToBeOpaque(layoutObject);
 
   ASSERT_NOT_REACHED();
 
   return false;
 }
 
-static ImageResource* cachedImageForCSSValue(CSSValue* value,
-                                             const Document& document) {
+static ImageResourceContent* cachedImageForCSSValue(CSSValue* value,
+                                                    const Document& document) {
   if (!value)
     return nullptr;
 
   if (value->isImageValue()) {
     StyleImage* styleImageResource =
         toCSSImageValue(value)->cacheImage(document);
     if (!styleImageResource)
       return nullptr;
 
     return styleImageResource->cachedImage();
   }
 
   if (value->isImageGeneratorValue()) {
     toCSSImageGeneratorValue(value)->loadSubimages(document);
     // FIXME: Handle CSSImageGeneratorValue (and thus cross-fades with gradients
     // and canvas).
     return nullptr;
   }
 
   ASSERT_NOT_REACHED();
 
   return nullptr;
 }
 
 static Image* renderableImageForCSSValue(CSSValue* value,
                                          const LayoutObject& layoutObject) {
-  ImageResource* cachedImage =
+  ImageResourceContent* cachedImage =
       cachedImageForCSSValue(value, layoutObject.document());
 
   if (!cachedImage || cachedImage->errorOccurred() ||
       cachedImage->getImage()->isNull())
     return nullptr;
 
   return cachedImage->getImage();
 }
 
 static KURL urlForCSSValue(const CSSValue* value) {
@@ skipping 91 matching lines @@
          subimageIsPending(m_toValue.get());
 }
 
 bool CSSCrossfadeValue::knownToBeOpaque(
     const LayoutObject& layoutObject) const {
   return subimageKnownToBeOpaque(m_fromValue.get(), layoutObject) &&
          subimageKnownToBeOpaque(m_toValue.get(), layoutObject);
 }
 
 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);
 
   if (m_cachedFromImage != oldCachedFromImage) {
     if (oldCachedFromImage)
       oldCachedFromImage->removeObserver(&m_crossfadeSubimageObserver);
     if (m_cachedFromImage)
       m_cachedFromImage->addObserver(&m_crossfadeSubimageObserver);
   }
@@ skipping 45 matching lines @@
 
 bool CSSCrossfadeValue::willRenderImage() const {
   for (const auto& curr : clients()) {
     if (const_cast<LayoutObject*>(curr.key)->willRenderImage())
       return true;
   }
   return false;
 }
 
 void CSSCrossfadeValue::CrossfadeSubimageObserverProxy::imageChanged(
-    ImageResource*,
+    ImageResourceContent*,
     const IntRect* rect) {
   if (m_ready)
     m_ownerValue->crossfadeChanged(*rect);
 }
 
 bool CSSCrossfadeValue::CrossfadeSubimageObserverProxy::willRenderImage() {
   // If the images are not ready/loaded we won't paint them. If the images
   // are ready then ask the clients.
   return m_ready && m_ownerValue->willRenderImage();
 }
@@ skipping 16 matching lines @@
   visitor->trace(m_fromValue);
   visitor->trace(m_toValue);
   visitor->trace(m_percentageValue);
   visitor->trace(m_cachedFromImage);
   visitor->trace(m_cachedToImage);
   visitor->trace(m_crossfadeSubimageObserver);
   CSSImageGeneratorValue::traceAfterDispatch(visitor);
 }
 
 }  // namespace blink