Move Image ownership out of CSSValue

Source/core/css/CSSImageValue.h

 /*
  * (C) 1999-2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2008, 2012 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 CSSImageValue_h
 #define CSSImageValue_h
 
 #include "core/css/CSSValue.h"
+#include "core/style/StyleImage.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "platform/weborigin/Referrer.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class Document;
 class KURL;
 class StyleFetchedImage;
 class StyleImage;
 class LayoutObject;
 
 class CSSImageValue : public CSSValue {
 public:
+    static PassRefPtrWillBeRawPtr<CSSImageValue> create(const String& relativeUrl, const String& absoluteUrl, StyleImage* image = 0)
+    {
+        return adoptRefWillBeNoop(new CSSImageValue(relativeUrl, absoluteUrl, image));
+    }
     static PassRefPtrWillBeRawPtr<CSSImageValue> create(const KURL& url, StyleImage* image = 0)
     {
-        return adoptRefWillBeNoop(new CSSImageValue(url, url, image));
+        return adoptRefWillBeNoop(new CSSImageValue(url.string(), url.string(), image));
     }
     static PassRefPtrWillBeRawPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleImage* image = 0)
     {
-        return adoptRefWillBeNoop(new CSSImageValue(rawValue, url, image));
+        return adoptRefWillBeNoop(new CSSImageValue(rawValue, url.string(), image));
     }
     ~CSSImageValue();
 
-    StyleFetchedImage* cachedImage(Document*, const ResourceLoaderOptions&);
-    StyleFetchedImage* cachedImage(Document* document) { return cachedImage(document, ResourceFetcher::defaultResourceOptions()); }
+    StyleFetchedImage* cachedImage(Document*, const ResourceLoaderOptions&, CSSStyleImageMap&);
+    StyleFetchedImage* cachedImage(Document* document, CSSStyleImageMap& imageMap) { return cachedImage(document, ResourceFetcher::defaultResourceOptions(), imageMap); }
     // Returns a StyleFetchedImage if the image is cached already, otherwise a StylePendingImage.
     StyleImage* cachedOrPendingImage();
+    StyleImage* cachedOrPendingImage(CSSStyleImageMap&);
 
-    const String& url() { return m_absoluteURL; }
+    const String& relativeUrl() const { return m_relativeURL; }
+    const String& url() const { return m_absoluteURL; }
 
     void setReferrer(const Referrer& referrer) { m_referrer = referrer; }
     const Referrer& referrer() const { return m_referrer; }
 
-    void reResolveURL(const Document&);
+    //void reResolveURL(const Document&);
 
     String customCSSText() const;
 
     bool hasFailedOrCanceledSubresources() const;
 
     bool equals(const CSSImageValue&) const;
 
     bool knownToBeOpaque(const LayoutObject*) const;
 
     void setInitiator(const AtomicString& name) { m_initiatorName = name; }
 
     DECLARE_TRACE_AFTER_DISPATCH();
-    void restoreCachedResourceIfNeeded(Document&);
+    void restoreCachedResourceIfNeeded(Document&, CSSStyleImageMap&);
 
 private:
-    CSSImageValue(const String& rawValue, const KURL&, StyleImage*);
+    CSSImageValue(const String& rawValue, const String& url, StyleImage*);
 
     String m_relativeURL;
     String m_absoluteURL;
     Referrer m_referrer;
     RefPtrWillBeMember<StyleImage> m_image;
     bool m_accessedImage;
     AtomicString m_initiatorName;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageValue, isImageValue());
 
 } // namespace blink
 
 #endif // CSSImageValue_h