| Index: third_party/WebKit/Source/core/css/FontLoader.h
|
| diff --git a/third_party/WebKit/Source/core/css/FontLoader.h b/third_party/WebKit/Source/core/css/FontLoader.h
|
| index 9221b4f5553f1e36139f69a70b73247960fd4f40..181630a845c11a4cee5332284553d4c2cdf8294e 100644
|
| --- a/third_party/WebKit/Source/core/css/FontLoader.h
|
| +++ b/third_party/WebKit/Source/core/css/FontLoader.h
|
| @@ -16,11 +16,11 @@ class CSSFontSelector;
|
| class Document;
|
| class FontResource;
|
|
|
| -class FontLoader : public RefCountedWillBeGarbageCollectedFinalized<FontLoader> {
|
| +class FontLoader : public GarbageCollectedFinalized<FontLoader> {
|
| public:
|
| - static PassRefPtrWillBeRawPtr<FontLoader> create(CSSFontSelector* fontSelector, Document* document)
|
| + static RawPtr<FontLoader> create(CSSFontSelector* fontSelector, Document* document)
|
| {
|
| - return adoptRefWillBeNoop(new FontLoader(fontSelector, document));
|
| + return new FontLoader(fontSelector, document);
|
| }
|
| ~FontLoader();
|
|
|
| @@ -43,10 +43,10 @@ private:
|
| Timer<FontLoader> m_beginLoadingTimer;
|
|
|
| struct FontToLoad;
|
| - using FontsToLoadVector = WillBeHeapVector<OwnPtrWillBeMember<FontToLoad>>;
|
| + using FontsToLoadVector = HeapVector<Member<FontToLoad>>;
|
| FontsToLoadVector m_fontsToBeginLoading;
|
| - RawPtrWillBeMember<CSSFontSelector> m_fontSelector;
|
| - RawPtrWillBeWeakMember<Document> m_document;
|
| + Member<CSSFontSelector> m_fontSelector;
|
| + WeakMember<Document> m_document;
|
| };
|
|
|
| } // namespace blink
|
|
|