Revert of Replace RawPtr with RefPtr on StylePendingImage

third_party/WebKit/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,
@@ skipping 32 matching lines @@
     static PassRefPtrWillBeRawPtr<CSSImageValue> create(const String& rawValue, const KURL& url, StyleImage* image = 0)
     {
         return create(AtomicString(rawValue), url, image);
     }
     static PassRefPtrWillBeRawPtr<CSSImageValue> create(const AtomicString& rawValue, const KURL& url, StyleImage* image = 0)
     {
         return adoptRefWillBeNoop(new CSSImageValue(rawValue, url, image));
     }
     ~CSSImageValue();
 
-    bool isCachePending() const { return m_isCachePending; }
-    StyleImage* cachedImage() { ASSERT(!isCachePending()); return m_cachedImage.get(); }
-    StyleFetchedImage* cacheImage(Document*, const ResourceLoaderOptions&);
-    StyleFetchedImage* cacheImage(Document* document) { return cacheImage(document, ResourceFetcher::defaultResourceOptions()); }
+    StyleFetchedImage* cachedImage(Document*, const ResourceLoaderOptions&);
+    StyleFetchedImage* cachedImage(Document* document) { return cachedImage(document, ResourceFetcher::defaultResourceOptions()); }
+    // Returns a StyleFetchedImage if the image is cached already, otherwise a StylePendingImage.
+    StyleImage* cachedOrPendingImage();
 
     const String& url() { return m_absoluteURL; }
 
     void setReferrer(const Referrer& referrer) { m_referrer = referrer; }
     const Referrer& referrer() const { return m_referrer; }
 
     void reResolveURL(const Document&);
 
     String customCSSText() const;
 
     bool hasFailedOrCanceledSubresources() const;
 
     bool equals(const CSSImageValue&) const;
 
     bool knownToBeOpaque(const LayoutObject*) const;
 
     PassRefPtrWillBeRawPtr<CSSImageValue> valueWithURLMadeAbsolute()
     {
-        return create(KURL(ParsedURLString, m_absoluteURL), m_cachedImage.get());
+        return create(KURL(ParsedURLString, m_absoluteURL), m_image.get());
     }
 
     void setInitiator(const AtomicString& name) { m_initiatorName = name; }
 
     DECLARE_TRACE_AFTER_DISPATCH();
     void restoreCachedResourceIfNeeded(Document&);
 
 private:
     CSSImageValue(const AtomicString& rawValue, const KURL&, StyleImage*);
 
     AtomicString m_relativeURL;
     AtomicString m_absoluteURL;
     Referrer m_referrer;
-    bool m_isCachePending;
-    RefPtrWillBeMember<StyleImage> m_cachedImage;
+    RefPtrWillBeMember<StyleImage> m_image;
+    bool m_accessedImage;
     AtomicString m_initiatorName;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageValue, isImageValue());
 
 } // namespace blink
 
 #endif // CSSImageValue_h