Revert of Replace RawPtr with RefPtr on StylePendingImage

third_party/WebKit/Source/core/css/CSSImageSetValue.h

 /*
  * Copyright (C) 2012 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 28 matching lines @@
 
 class CSSImageSetValue : public CSSValueList {
 public:
 
     static PassRefPtrWillBeRawPtr<CSSImageSetValue> create()
     {
         return adoptRefWillBeNoop(new CSSImageSetValue());
     }
     ~CSSImageSetValue();
 
-    bool isCachePending(float deviceScaleFactor) const;
-    StyleImage* cachedImageSet(float deviceScaleFactor);
-    StyleFetchedImageSet* cacheImageSet(Document*, float deviceScaleFactor, const ResourceLoaderOptions&);
-    StyleFetchedImageSet* cacheImageSet(Document*, float deviceScaleFactor);
+    StyleFetchedImageSet* cachedImageSet(Document*, float deviceScaleFactor, const ResourceLoaderOptions&);
+    StyleFetchedImageSet* cachedImageSet(Document*, float deviceScaleFactor);
+
+    // Returns a StyleFetchedImageSet if the best fit image has been cached already, otherwise a StylePendingImage.
+    StyleImage* cachedOrPendingImageSet(float);
 
     String customCSSText() const;
 
+    bool isPending() const { return !m_accessedBestFitImage; }
+
     struct ImageWithScale {
         ALLOW_ONLY_INLINE_ALLOCATION();
         String imageURL;
         Referrer referrer;
         float scaleFactor;
     };
 
     PassRefPtrWillBeRawPtr<CSSImageSetValue> valueWithURLsMadeAbsolute();
 
     bool hasFailedOrCanceledSubresources() const;
 
     DECLARE_TRACE_AFTER_DISPATCH();
 
 protected:
-    ImageWithScale bestImageForScaleFactor(float scaleFactor);
+    ImageWithScale bestImageForScaleFactor();
 
 private:
     CSSImageSetValue();
 
     void fillImageSet();
     static inline bool compareByScaleFactor(ImageWithScale first, ImageWithScale second) { return first.scaleFactor < second.scaleFactor; }
 
-    bool m_isCachePending;
-    float m_cachedScaleFactor;
-    RefPtrWillBeMember<StyleImage> m_cachedImageSet;
+    RefPtrWillBeMember<StyleImage> m_imageSet;
+    bool m_accessedBestFitImage;
+
+    // This represents the scale factor that we used to find the best fit image. It does not necessarily
+    // correspond to the scale factor of the best fit image.
+    float m_scaleFactor;
 
     Vector<ImageWithScale> m_imagesInSet;
 };
 
 DEFINE_CSS_VALUE_TYPE_CASTS(CSSImageSetValue, isImageSetValue());
 
 } // namespace blink
 
 #endif // CSSImageSetValue_h