Move Image ownership out of CSSValue

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 16 matching lines @@
 #include "core/css/CSSCrossfadeValue.h"
 
 #include "core/css/CSSImageValue.h"
 #include "core/layout/LayoutObject.h"
 #include "core/style/StyleFetchedImage.h"
 #include "platform/graphics/CrossfadeGeneratedImage.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
-static bool subimageIsPending(CSSValue* value)
+static bool subimageIsPending(CSSStyleImageMap& imageMap, CSSValue* value)
 {
     if (value->isImageValue())
-        return toCSSImageValue(value)->cachedOrPendingImage()->isPendingImage();
+        return toCSSImageValue(value)->cachedOrPendingImage(imageMap)->isPendingImage();
 
     if (value->isImageGeneratorValue())
-        return toCSSImageGeneratorValue(value)->isPending();
+        return toCSSImageGeneratorValue(value)->isPending(imageMap);
 
     ASSERT_NOT_REACHED();
 
     return false;
 }
 
 static bool subimageKnownToBeOpaque(CSSValue* value, const LayoutObject* layoutObject)
 {
     if (value->isImageValue())
         return toCSSImageValue(value)->knownToBeOpaque(layoutObject);
 
     if (value->isImageGeneratorValue())
         return toCSSImageGeneratorValue(value)->knownToBeOpaque(layoutObject);
 
     ASSERT_NOT_REACHED();
 
     return false;
 }
 
-static ImageResource* cachedImageForCSSValue(CSSValue* value, Document* document)
+static ImageResource* cachedImageForCSSValue(CSSValue* value, Document* document, CSSStyleImageMap& imageMap)
 {
     if (!value)
         return 0;
 
     if (value->isImageValue()) {
-        StyleFetchedImage* styleImageResource = toCSSImageValue(value)->cachedImage(document);
+        StyleFetchedImage* styleImageResource = toCSSImageValue(value)->cachedImage(document, imageMap);
         if (!styleImageResource)
             return 0;
 
         return styleImageResource->cachedImage();
     }
 
     if (value->isImageGeneratorValue()) {
-        toCSSImageGeneratorValue(value)->loadSubimages(document);
+        toCSSImageGeneratorValue(value)->loadSubimages(document, imageMap);
         // FIXME: Handle CSSImageGeneratorValue (and thus cross-fades with gradients and canvas).
         return 0;
     }
 
     ASSERT_NOT_REACHED();
 
     return 0;
 }
 
 CSSCrossfadeValue::~CSSCrossfadeValue()
@@ skipping 16 matching lines @@
     result.append(')');
     return result.toString();
 }
 
 IntSize CSSCrossfadeValue::fixedSize(const LayoutObject* layoutObject)
 {
     float percentage = m_percentageValue->getFloatValue();
     float inversePercentage = 1 - percentage;
 
     Document* document = &layoutObject->document();
-    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
-    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
+    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document, layoutObject->mutableStyle()->mutableCssImages());
+    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document, layoutObject->mutableStyle()->mutableCssImages());
 
     if (!cachedFromImage || !cachedToImage)
         return IntSize();
 
     IntSize fromImageSize = cachedFromImage->imageForLayoutObject(layoutObject)->size();
     IntSize toImageSize = cachedToImage->imageForLayoutObject(layoutObject)->size();
 
     // Rounding issues can cause transitions between images of equal size to return
     // a different fixed size; avoid performing the interpolation if the images are the same size.
     if (fromImageSize == toImageSize)
         return fromImageSize;
 
     return IntSize(fromImageSize.width() * inversePercentage + toImageSize.width() * percentage,
         fromImageSize.height() * inversePercentage + toImageSize.height() * percentage);
 }
 
-bool CSSCrossfadeValue::isPending() const
+bool CSSCrossfadeValue::isPending(CSSStyleImageMap& imageMap) const
 {
-    return subimageIsPending(m_fromValue.get()) || subimageIsPending(m_toValue.get());
+    return subimageIsPending(imageMap, m_fromValue.get()) || subimageIsPending(imageMap, m_toValue.get());
 }
 
 bool CSSCrossfadeValue::knownToBeOpaque(const LayoutObject* layoutObject) const
 {
     return subimageKnownToBeOpaque(m_fromValue.get(), layoutObject) && subimageKnownToBeOpaque(m_toValue.get(), layoutObject);
 }
 
-void CSSCrossfadeValue::loadSubimages(Document* document)
+void CSSCrossfadeValue::loadSubimages(Document* document, CSSStyleImageMap& imageMap)
 {
-    ResourcePtr<ImageResource> oldCachedFromImage = m_cachedFromImage;
-    ResourcePtr<ImageResource> oldCachedToImage = m_cachedToImage;
+    ResourcePtr<ImageResource>& oldCachedFromImage = imageMap.getImageResourceEntry(this).storedValue->value;
+    ResourcePtr<ImageResource>& oldCachedToImage = imageMap.getImageResourceEntry(reinterpret_cast<CSSCrossfadeValue*>(reinterpret_cast<uintptr_t>(this) & 1)).storedValue->value;
 
-    m_cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
-    m_cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
+    ResourcePtr<ImageResource> cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document, imageMap);
+    ResourcePtr<ImageResource> cachedToImage = cachedImageForCSSValue(m_toValue.get(), document, imageMap);
 
-    if (m_cachedFromImage != oldCachedFromImage) {
+    if (cachedFromImage != oldCachedFromImage) {
         if (oldCachedFromImage)
             oldCachedFromImage->removeClient(&m_crossfadeSubimageObserver);
-        if (m_cachedFromImage)
-            m_cachedFromImage->addClient(&m_crossfadeSubimageObserver);
+        if (cachedFromImage)
+            cachedFromImage->addClient(&m_crossfadeSubimageObserver);
     }
 
-    if (m_cachedToImage != oldCachedToImage) {
+    if (cachedToImage != oldCachedToImage) {
         if (oldCachedToImage)
             oldCachedToImage->removeClient(&m_crossfadeSubimageObserver);
-        if (m_cachedToImage)
-            m_cachedToImage->addClient(&m_crossfadeSubimageObserver);
+        if (cachedToImage)
+            cachedToImage->addClient(&m_crossfadeSubimageObserver);
     }
 
+    oldCachedFromImage = cachedFromImage;
+    oldCachedToImage = cachedToImage;
+
     m_crossfadeSubimageObserver.setReady(true);
 }
 
 PassRefPtr<Image> CSSCrossfadeValue::image(LayoutObject* layoutObject, const IntSize& size)
 {
     if (size.isEmpty())
         return nullptr;
 
     Document* document = &layoutObject->document();
-    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document);
-    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document);
+    ImageResource* cachedFromImage = cachedImageForCSSValue(m_fromValue.get(), document, layoutObject->mutableStyle()->mutableCssImages());
+    ImageResource* cachedToImage = cachedImageForCSSValue(m_toValue.get(), document, layoutObject->mutableStyle()->mutableCssImages());
 
     if (!cachedFromImage || !cachedToImage)
         return Image::nullImage();
 
     Image* fromImage = cachedFromImage->imageForLayoutObject(layoutObject);
     Image* toImage = cachedToImage->imageForLayoutObject(layoutObject);
 
     if (!fromImage || !toImage)
         return Image::nullImage();
 
-    m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_percentageValue->getFloatValue(), fixedSize(layoutObject), size);
+    RefPtr<Image>& generatedImage = layoutObject->mutableStyle()->mutableCssImages().getImageEntry(this).storedValue->value;
+    generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_percentageValue->getFloatValue(), fixedSize(layoutObject), size);
 
-    return m_generatedImage.release();
+    return generatedImage.release();
 }
 
 void CSSCrossfadeValue::crossfadeChanged(const IntRect&)
 {
     for (const auto& curr : clients()) {
         LayoutObject* client = const_cast<LayoutObject*>(curr.key);
         client->imageChanged(static_cast<WrappedImagePtr>(this));
     }
 }
 
@@ skipping 22 matching lines @@
 DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue)
 {
     visitor->trace(m_fromValue);
     visitor->trace(m_toValue);
     visitor->trace(m_percentageValue);
     visitor->trace(m_crossfadeSubimageObserver);
     CSSImageGeneratorValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink