Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(714)

Unified Diff: third_party/WebKit/Source/core/style/StyleFetchedImageSet.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f45652eb41cf71aeaf1136681f54abe6483b1697..37dfe5d40962d917cc0bf53f87658b6e115e82ca 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 ResourceClient {
- 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
@@ -81,10 +80,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;
};

Powered by Google App Engine
This is Rietveld 408576698