Move Image ownership out of CSSValue

Source/core/css/CSSImageGeneratorValue.h

 /*
  * Copyright (C) 2008 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 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CSSImageGeneratorValue_h
 #define CSSImageGeneratorValue_h
 
 #include "core/CoreExport.h"
 #include "core/css/CSSValue.h"
+#include "core/style/StyleImage.h"
 #include "platform/geometry/IntSizeHash.h"
 #include "wtf/HashCountedSet.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
+class ComputedStyle;
 class Document;
+class ElementStyleResources;
 class Image;
 class LayoutObject;
 
 struct SizeAndCount {
     DISALLOW_ALLOCATION();
     SizeAndCount(IntSize newSize = IntSize(), int newCount = 0)
         : size(newSize)
         , count(newCount)
     {
     }
 
     IntSize size;
     int count;
 };
 
 typedef HashMap<const LayoutObject*, SizeAndCount> LayoutObjectSizeCountMap;
 
 class CORE_EXPORT CSSImageGeneratorValue : public CSSValue {
 public:
     ~CSSImageGeneratorValue();
 
     void addClient(LayoutObject*, const IntSize&);
     void removeClient(LayoutObject*);
     PassRefPtr<Image> image(LayoutObject*, const IntSize&);
 
     bool isFixedSize() const;
     IntSize fixedSize(const LayoutObject*);
 
-    bool isPending() const;
+    bool isPending(CSSStyleImageMap&) const;
     bool knownToBeOpaque(const LayoutObject*) const;
 
-    void loadSubimages(Document*);
+    void loadSubimages(Document*, CSSStyleImageMap&);
 
     DEFINE_INLINE_TRACE_AFTER_DISPATCH() { CSSValue::traceAfterDispatch(visitor); }
 
 protected:
     explicit CSSImageGeneratorValue(ClassType);
 
     Image* getImage(LayoutObject*, const IntSize&);
     void putImage(const IntSize&, PassRefPtr<Image>);
     const LayoutObjectSizeCountMap& clients() const { return m_clients; }
 
     HashCountedSet<IntSize> m_sizes; // A count of how many times a given image size is in use.
     LayoutObjectSizeCountMap m_clients; // A map from LayoutObjects (with entry count) to image sizes.
     HashMap<IntSize, RefPtr<Image>> m_images; // A cache of Image objects by image size.
 
 #if ENABLE(OILPAN)
     // FIXME: Oilpan: when/if we can make the layoutObject point directly to the CSSImageGenerator value using
     // a member we don't need to have this hack where we keep a persistent to the instance as long as
     // there are clients in the LayoutObjectSizeCountMap.
     SelfKeepAlive<CSSImageGeneratorValue> m_keepAlive;
 #endif
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageGeneratorValue, isImageGeneratorValue());
 
 } // namespace blink
 
 #endif // CSSImageGeneratorValue_h