Move Image ownership out of CSSValue

Source/core/css/resolver/ElementStyleResources.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 38 matching lines @@
         return setOrPendingFromValue(property, toCSSImageSetValue(value));
 
     if (value->isCursorImageValue())
         return cursorOrPendingFromValue(property, toCSSCursorImageValue(value));
 
     return nullptr;
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::generatedOrPendingFromValue(CSSPropertyID property, CSSImageGeneratorValue* value)
 {
-    if (value->isPending()) {
+    if (value->isPending(mutableCssImages())) {
         m_pendingImageProperties.set(property, value);
         return StylePendingImage::create(value);
     }
     return StyleGeneratedImage::create(value);
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue* value)
 {
     RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImageSet(m_deviceScaleFactor);
     if (image && image->isPendingImage())
         m_pendingImageProperties.set(property, value);
     return image.release();
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cachedOrPendingFromValue(Document& document, CSSPropertyID property, CSSImageValue* value)
 {
-    RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImage();
-    if (image) {
-        if (image->isPendingImage())
-            m_pendingImageProperties.set(property, value);
-        else
-            value->restoreCachedResourceIfNeeded(document);
-    }
+    RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImage(mutableCssImages());
+    ASSERT(image);
+    if (image->isPendingImage())
+        m_pendingImageProperties.set(property, value);
+    else
+        value->restoreCachedResourceIfNeeded(document, mutableCssImages());
     return image.release();
 }
 
 PassRefPtrWillBeRawPtr<StyleImage> ElementStyleResources::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue* value)
 {
-    RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImage(m_deviceScaleFactor);
+    RefPtrWillBeRawPtr<StyleImage> image = value->cachedOrPendingImage(mutableCssImages(), m_deviceScaleFactor);
     if (image && image->isPendingImage())
         m_pendingImageProperties.set(property, value);
     return image.release();
 }
 
 void ElementStyleResources::clearPendingImageProperties()
 {
     m_pendingImageProperties.clear();
 }
 
 void ElementStyleResources::clearPendingSVGDocuments()
 {
     m_pendingSVGDocuments.clear();
 }
 
+void ElementStyleResources::clearCSSImages()
+{
+    printf("ElementStyleResources clearing\n");
+    m_cssImages.clear();
+    printf("ElementStyleResources cleared\n");
+}
+
 void ElementStyleResources::addPendingSVGDocument(FilterOperation* filterOperation, CSSSVGDocumentValue* cssSVGDocumentValue)
 {
     m_pendingSVGDocuments.set(filterOperation, cssSVGDocumentValue);
 }
 
 }