| Index: third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
|
| diff --git a/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h b/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
|
| index a11d0013f0acbfa0346854722d1183fe11a597a8..86e619fe7d607604945db853639dff87455a4233 100644
|
| --- a/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
|
| +++ b/third_party/WebKit/Source/core/style/StyleFetchedImageSet.h
|
| @@ -38,17 +38,16 @@ class CSSImageSetValue;
|
| // This class keeps one cached image and has access to a set of alternatives.
|
|
|
| class StyleFetchedImageSet final : public StyleImage, private ImageResourceClient {
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(StyleFetchedImageSet);
|
| - WILL_BE_USING_PRE_FINALIZER(StyleFetchedImageSet, dispose);
|
| + USING_PRE_FINALIZER(StyleFetchedImageSet, dispose);
|
| public:
|
| - static PassRefPtrWillBeRawPtr<StyleFetchedImageSet> create(ImageResource* image, float imageScaleFactor, CSSImageSetValue* value, const KURL& url)
|
| + static RawPtr<StyleFetchedImageSet> create(ImageResource* image, float imageScaleFactor, CSSImageSetValue* value, const KURL& url)
|
| {
|
| - return adoptRefWillBeNoop(new StyleFetchedImageSet(image, imageScaleFactor, value, url));
|
| + return (new StyleFetchedImageSet(image, imageScaleFactor, value, url));
|
| }
|
| ~StyleFetchedImageSet() override;
|
|
|
| - PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
|
| - PassRefPtrWillBeRawPtr<CSSValue> computedCSSValue() const override;
|
| + RawPtr<CSSValue> cssValue() const override;
|
| + RawPtr<CSSValue> computedCSSValue() const override;
|
|
|
| // FIXME: This is used by StyleImage for equals comparison, but this implementation
|
| // only looks at the image from the set that we have loaded. I'm not sure if that is
|
| @@ -82,10 +81,10 @@ private:
|
|
|
| String debugName() const override { return "StyleFetchedImageSet"; }
|
|
|
| - RefPtrWillBeMember<ImageResource> m_bestFitImage;
|
| + Member<ImageResource> m_bestFitImage;
|
| float m_imageScaleFactor;
|
|
|
| - RawPtrWillBeMember<CSSImageSetValue> m_imageSetValue; // Not retained; it owns us.
|
| + Member<CSSImageSetValue> m_imageSetValue; // Not retained; it owns us.
|
| const KURL m_url;
|
| };
|
|
|
|
|