Oilpan: Remove most WillBe types from the code base

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

 /*
  * Copyright (C) 2013 Google 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 40 matching lines @@
 class CSSFontFace;
 class CSSFontFaceSource;
 class CSSFontSelector;
 class Dictionary;
 class ExceptionState;
 class Font;
 class FontFaceCache;
 class FontResource;
 class ExecutionContext;
 
-using FontFaceSetIterable = PairIterable<RefPtrWillBeMember<FontFace>, RefPtrWillBeMember<FontFace>>;
+using FontFaceSetIterable = PairIterable<Member<FontFace>, Member<FontFace>>;
 
 #if ENABLE(OILPAN)
 class FontFaceSet final : public EventTargetWithInlineData, public HeapSupplement<Document>, public ActiveDOMObject, public FontFaceSetIterable {
     USING_GARBAGE_COLLECTED_MIXIN(FontFaceSet);
     using SupplementType = HeapSupplement<Document>;
 #else
 class FontFaceSet final : public EventTargetWithInlineData, public RefCountedSupplement<Document, FontFaceSet>, public ActiveDOMObject, public FontFaceSetIterable {
     REFCOUNTED_EVENT_TARGET(FontFaceSet);
     using SupplementType = RefCountedSupplement<Document, FontFaceSet>;
 #endif
     DEFINE_WRAPPERTYPEINFO();
 public:
     ~FontFaceSet() override;
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loading);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingdone);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(loadingerror);
 
     bool check(const String& font, const String& text, ExceptionState&);
     ScriptPromise load(ScriptState*, const String& font, const String& text);
     ScriptPromise ready(ScriptState*);
 
-    PassRefPtrWillBeRawPtr<FontFaceSet> addForBinding(ScriptState*, FontFace*, ExceptionState&);
+    RawPtr<FontFaceSet> addForBinding(ScriptState*, FontFace*, ExceptionState&);
     void clearForBinding(ScriptState*, ExceptionState&);
     bool deleteForBinding(ScriptState*, FontFace*, ExceptionState&);
     bool hasForBinding(ScriptState*, FontFace*, ExceptionState&) const;
 
     size_t size() const;
     AtomicString status() const;
 
     ExecutionContext* executionContext() const override;
     const AtomicString& interfaceName() const override;
 
     Document* document() const;
 
     void didLayout();
     void beginFontLoading(FontFace*);
     void fontLoaded(FontFace*);
     void loadError(FontFace*);
 
     // ActiveDOMObject
     void suspend() override;
     void resume() override;
     void stop() override;
 
-    static PassRefPtrWillBeRawPtr<FontFaceSet> from(Document&);
+    static RawPtr<FontFaceSet> from(Document&);
     static void didLayout(Document&);
 
     void addFontFacesToFontFaceCache(FontFaceCache*, CSSFontSelector*);
 
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    static PassRefPtrWillBeRawPtr<FontFaceSet> create(Document& document)
+    static RawPtr<FontFaceSet> create(Document& document)
     {
-        return adoptRefWillBeNoop(new FontFaceSet(document));
+        return (new FontFaceSet(document));
     }
 
     FontFaceSetIterable::IterationSource* startIteration(ScriptState*, ExceptionState&) override;
 
     class IterationSource final : public FontFaceSetIterable::IterationSource {
     public:
-        explicit IterationSource(const WillBeHeapVector<RefPtrWillBeMember<FontFace>>& fontFaces)
+        explicit IterationSource(const HeapVector<Member<FontFace>>& fontFaces)
             : m_index(0)
             , m_fontFaces(fontFaces) { }
-        bool next(ScriptState*, RefPtrWillBeMember<FontFace>&, RefPtrWillBeMember<FontFace>&, ExceptionState&) override;
+        bool next(ScriptState*, Member<FontFace>&, Member<FontFace>&, ExceptionState&) override;
 
         DEFINE_INLINE_VIRTUAL_TRACE()
         {
             visitor->trace(m_fontFaces);
             FontFaceSetIterable::IterationSource::trace(visitor);
         }
 
     private:
         size_t m_index;
-        WillBeHeapVector<RefPtrWillBeMember<FontFace>> m_fontFaces;
+        HeapVector<Member<FontFace>> m_fontFaces;
     };
 
     class FontLoadHistogram {
         DISALLOW_NEW();
     public:
         enum Status { NoWebFonts, HadBlankText, DidNotHaveBlankText, Reported };
         FontLoadHistogram() : m_status(NoWebFonts), m_count(0), m_recorded(false) { }
         void incrementCount() { m_count++; }
         void updateStatus(FontFace*);
         void record();
 
     private:
         Status m_status;
         int m_count;
         bool m_recorded;
     };
 
     FontFaceSet(Document&);
 
     bool inActiveDocumentContext() const;
-    void addToLoadingFonts(PassRefPtrWillBeRawPtr<FontFace>);
-    void removeFromLoadingFonts(PassRefPtrWillBeRawPtr<FontFace>);
+    void addToLoadingFonts(RawPtr<FontFace>);
+    void removeFromLoadingFonts(RawPtr<FontFace>);
     void fireLoadingEvent();
     void fireDoneEventIfPossible();
     bool resolveFontStyle(const String&, Font&);
     void handlePendingEventsAndPromisesSoon();
     void handlePendingEventsAndPromises();
-    const WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>>& cssConnectedFontFaceList() const;
+    const HeapListHashSet<Member<FontFace>>& cssConnectedFontFaceList() const;
     bool isCSSConnectedFontFace(FontFace*) const;
     bool shouldSignalReady() const;
 
-    using ReadyProperty = ScriptPromiseProperty<RawPtrWillBeMember<FontFaceSet>, RawPtrWillBeMember<FontFaceSet>, Member<DOMException>>;
+    using ReadyProperty = ScriptPromiseProperty<Member<FontFaceSet>, Member<FontFaceSet>, Member<DOMException>>;
 
-    WillBeHeapHashSet<RefPtrWillBeMember<FontFace>> m_loadingFonts;
+    HeapHashSet<Member<FontFace>> m_loadingFonts;
     bool m_shouldFireLoadingEvent;
     bool m_isLoading;
-    PersistentWillBeMember<ReadyProperty> m_ready;
+    Member<ReadyProperty> m_ready;
     FontFaceArray m_loadedFonts;
     FontFaceArray m_failedFonts;
-    WillBeHeapListHashSet<RefPtrWillBeMember<FontFace>> m_nonCSSConnectedFaces;
+    HeapListHashSet<Member<FontFace>> m_nonCSSConnectedFaces;
 
-    PersistentWillBeMember<AsyncMethodRunner<FontFaceSet>> m_asyncRunner;
+    Member<AsyncMethodRunner<FontFaceSet>> m_asyncRunner;
 
     FontLoadHistogram m_histogram;
 };
 
 } // namespace blink
 
 #endif // FontFaceSet_h