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

Unified Diff: third_party/WebKit/Source/core/css/CSSFontFace.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, 10 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/css/CSSFontFace.h
diff --git a/third_party/WebKit/Source/core/css/CSSFontFace.h b/third_party/WebKit/Source/core/css/CSSFontFace.h
index 90b3b80f4c1b50d9e1c91d2be617c55f33513cff..b3843d8029ff359c63d1a07a153d2f30244b17c9 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFace.h
+++ b/third_party/WebKit/Source/core/css/CSSFontFace.h
@@ -42,8 +42,7 @@ class FontDescription;
class RemoteFontFaceSource;
class SimpleFontData;
-class CORE_EXPORT CSSFontFace final : public NoBaseWillBeGarbageCollectedFinalized<CSSFontFace> {
- USING_FAST_MALLOC_WILL_BE_REMOVED(CSSFontFace);
+class CORE_EXPORT CSSFontFace final : public GarbageCollectedFinalized<CSSFontFace> {
WTF_MAKE_NONCOPYABLE(CSSFontFace);
public:
struct UnicodeRange;
@@ -66,7 +65,7 @@ public:
bool isValid() const { return !m_sources.isEmpty(); }
- void addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource>);
+ void addSource(RawPtr<CSSFontFaceSource>);
void didBeginLoad();
void fontLoaded(RemoteFontFaceSource*);
@@ -122,9 +121,9 @@ private:
void setLoadStatus(FontFace::LoadStatus);
UnicodeRangeSet m_ranges;
- RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
- WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource>> m_sources;
- RawPtrWillBeMember<FontFace> m_fontFace;
+ Member<CSSSegmentedFontFace> m_segmentedFontFace;
+ HeapDeque<Member<CSSFontFaceSource>> m_sources;
+ Member<FontFace> m_fontFace;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698