Move Image ownership out of CSSValue

Source/core/style/StyleImage.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple 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.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef StyleImage_h
 #define StyleImage_h
 
 #include "core/CoreExport.h"
 #include "core/css/CSSValue.h"
+#include "core/fetch/ImageResource.h"
 #include "platform/geometry/IntSize.h"
 #include "platform/geometry/LayoutSize.h"
 #include "platform/graphics/Image.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
-class ImageResource;
 class CSSValue;
 class LayoutObject;
 
 typedef void* WrappedImagePtr;
 
 class CORE_EXPORT StyleImage : public RefCountedWillBeGarbageCollectedFinalized<StyleImage> {
 public:
-    virtual ~StyleImage() { }
+    virtual ~StyleImage() { printf("%p: StyleImage freed\n", this); }
 
     bool operator==(const StyleImage& other) const
     {
         return data() == other.data();
     }
 
     virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const = 0;
 
     virtual bool canRender(const LayoutObject&, float /*multiplier*/) const { return true; }
     virtual bool isLoaded() const { return true; }
@@ skipping 26 matching lines @@
         , m_isGeneratedImage(false)
         , m_isImageResourceSet(false)
     {
     }
     bool m_isImageResource:1;
     bool m_isPendingImage:1;
     bool m_isGeneratedImage:1;
     bool m_isImageResourceSet:1;
 };
 
+class CSSStyleImageMap {
+public:
+    typedef WillBeHeapHashMap<CSSValue*, RefPtrWillBeRawPtr<StyleImage>> StyleImageMap;
+    typedef WillBeHeapHashMap<CSSValue*, ResourcePtr<ImageResource>> ImageResourceMap;
+    typedef WillBeHeapHashMap<CSSValue*, RefPtr<Image>> ImageMap;
+
+    StyleImageMap::AddResult getStyleImageEntry(CSSValue* value) { return m_styleImages.add(value, nullptr); }
+    ImageResourceMap::AddResult getImageResourceEntry(CSSValue* value) { return m_imageResources.add(value, nullptr); }
+    ImageMap::AddResult getImageEntry(CSSValue* value) { return m_images.add(value, nullptr); }
+
+private:
+    StyleImageMap m_styleImages;
+    ImageResourceMap m_imageResources;
+    ImageMap m_images;
+};
+
 #define DEFINE_STYLE_IMAGE_TYPE_CASTS(thisType, function) \
     DEFINE_TYPE_CASTS(thisType, StyleImage, styleImage, styleImage->function, styleImage.function); \
     inline thisType* to##thisType(const RefPtrWillBeMember<StyleImage>& styleImage) { return to##thisType(styleImage.get()); } \
     typedef int NeedsSemiColonAfterDefineStyleImageTypeCasts
 
 }
 #endif