Oilpan: Remove most WillBe types from the code base

third_party/WebKit/Source/core/page/Page.h

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 54 matching lines @@
 class Settings;
 class SpellCheckerClient;
 class UndoStack;
 class ValidationMessageClient;
 class WebLayerTreeView;
 
 typedef uint64_t LinkHash;
 
 float deviceScaleFactor(LocalFrame*);
 
-class CORE_EXPORT Page final : public NoBaseWillBeGarbageCollectedFinalized<Page>, public WillBeHeapSupplementable<Page>, public PageLifecycleNotifier, public SettingsDelegate, public MemoryPurgeClient {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Page);
-    USING_FAST_MALLOC_WILL_BE_REMOVED(Page);
+class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>, public HeapSupplementable<Page>, public PageLifecycleNotifier, public SettingsDelegate, public MemoryPurgeClient {
+    USING_GARBAGE_COLLECTED_MIXIN(Page);
     WTF_MAKE_NONCOPYABLE(Page);
     friend class Settings;
 public:
     // It is up to the platform to ensure that non-null clients are provided where required.
     struct CORE_EXPORT PageClients final {
         STACK_ALLOCATED();
         WTF_MAKE_NONCOPYABLE(PageClients);
     public:
         PageClients();
         ~PageClients();
 
-        RawPtrWillBeMember<ChromeClient> chromeClient;
+        Member<ChromeClient> chromeClient;
         ContextMenuClient* contextMenuClient;
         EditorClient* editorClient;
         DragClient* dragClient;
         SpellCheckerClient* spellCheckerClient;
     };
 
-    static PassOwnPtrWillBeRawPtr<Page> create(PageClients& pageClients)
+    static RawPtr<Page> create(PageClients& pageClients)
     {
-        return adoptPtrWillBeNoop(new Page(pageClients));
+        return new Page(pageClients);
     }
 
     // An "ordinary" page is a fully-featured page owned by a web view.
-    static PassOwnPtrWillBeRawPtr<Page> createOrdinary(PageClients&);
+    static RawPtr<Page> createOrdinary(PageClients&);
 
     ~Page() override;
 
     void willBeClosed();
 
-    using PageSet = WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<Page>>;
+    using PageSet = PersistentHeapHashSet<WeakMember<Page>>;
 
     // Return the current set of full-fledged, ordinary pages.
     // Each created and owned by a WebView.
     //
     // This set does not include Pages created for other, internal purposes
     // (SVGImages, inspector overlays, page popups etc.)
     static PageSet& ordinaryPages();
 
     static void platformColorsChanged();
     static void onMemoryPressure();
@@ skipping 28 matching lines @@
 
     PageAnimator& animator() { return *m_animator; }
     ChromeClient& chromeClient() const { return *m_chromeClient; }
     AutoscrollController& autoscrollController() const { return *m_autoscrollController; }
     DragCaretController& dragCaretController() const { return *m_dragCaretController; }
     DragController& dragController() const { return *m_dragController; }
     FocusController& focusController() const { return *m_focusController; }
     ContextMenuController& contextMenuController() const { return *m_contextMenuController; }
     PointerLockController& pointerLockController() const { return *m_pointerLockController; }
     ValidationMessageClient& validationMessageClient() const { return *m_validationMessageClient; }
-    void setValidationMessageClient(PassOwnPtrWillBeRawPtr<ValidationMessageClient>);
+    void setValidationMessageClient(RawPtr<ValidationMessageClient>);
 
     ScrollingCoordinator* scrollingCoordinator();
 
     String mainThreadScrollingReasonsAsText();
     ClientRectList* nonFastScrollableRects(const LocalFrame*);
 
     Settings& settings() const { return *m_settings; }
 
     UseCounter& useCounter() { return m_useCounter; }
     Deprecation& deprecation() { return m_deprecation; }
@@ skipping 26 matching lines @@
     bool isPageVisible() const;
 
     bool isCursorVisible() const;
     void setIsCursorVisible(bool isVisible) { m_isCursorVisible = isVisible; }
 
 #if ENABLE(ASSERT)
     void setIsPainting(bool painting) { m_isPainting = painting; }
     bool isPainting() const { return m_isPainting; }
 #endif
 
-    class CORE_EXPORT MultisamplingChangedObserver : public WillBeGarbageCollectedMixin {
+    class CORE_EXPORT MultisamplingChangedObserver : public GarbageCollectedMixin {
     public:
         virtual void multisamplingChanged(bool) = 0;
     };
 
     void addMultisamplingChangedObserver(MultisamplingChangedObserver*);
 #if !ENABLE(OILPAN)
     void removeMultisamplingChangedObserver(MultisamplingChangedObserver*);
 #endif
 
     void didCommitLoad(LocalFrame*);
@@ skipping 16 matching lines @@
 private:
     explicit Page(PageClients&);
 
     void initGroup();
 
     // SettingsDelegate overrides.
     void settingsChanged(SettingsDelegate::ChangeType) override;
 
     void compressStrings(Timer<Page>*);
 
-    RefPtrWillBeMember<PageAnimator> m_animator;
-    const OwnPtrWillBeMember<AutoscrollController> m_autoscrollController;
-    RawPtrWillBeMember<ChromeClient> m_chromeClient;
-    const OwnPtrWillBeMember<DragCaretController> m_dragCaretController;
-    const OwnPtrWillBeMember<DragController> m_dragController;
-    const OwnPtrWillBeMember<FocusController> m_focusController;
-    const OwnPtrWillBeMember<ContextMenuController> m_contextMenuController;
-    const OwnPtrWillBeMember<PointerLockController> m_pointerLockController;
-    OwnPtrWillBeMember<ScrollingCoordinator> m_scrollingCoordinator;
-    const OwnPtrWillBeMember<UndoStack> m_undoStack;
+    Member<PageAnimator> m_animator;
+    const Member<AutoscrollController> m_autoscrollController;
+    Member<ChromeClient> m_chromeClient;
+    const Member<DragCaretController> m_dragCaretController;
+    const Member<DragController> m_dragController;
+    const Member<FocusController> m_focusController;
+    const Member<ContextMenuController> m_contextMenuController;
+    const Member<PointerLockController> m_pointerLockController;
+    Member<ScrollingCoordinator> m_scrollingCoordinator;
+    const Member<UndoStack> m_undoStack;
 
     // Typically, the main frame and Page should both be owned by the embedder,
     // which must call Page::willBeDestroyed() prior to destroying Page. This
     // call detaches the main frame and clears this pointer, thus ensuring that
     // this field only references a live main frame.
     //
     // However, there are several locations (InspectorOverlay, SVGImage, and
     // WebPagePopupImpl) which don't hold a reference to the main frame at all
     // after creating it. These are still safe because they always create a
     // Frame with a FrameView. FrameView and Frame hold references to each
     // other, thus keeping each other alive. The call to willBeDestroyed()
     // breaks this cycle, so the frame is still properly destroyed once no
     // longer needed.
-    RawPtrWillBeMember<Frame> m_mainFrame;
+    Member<Frame> m_mainFrame;
 
     mutable RefPtr<PluginData> m_pluginData;
 
     EditorClient* const m_editorClient;
     SpellCheckerClient* const m_spellCheckerClient;
-    OwnPtrWillBeMember<ValidationMessageClient> m_validationMessageClient;
+    Member<ValidationMessageClient> m_validationMessageClient;
 
     UseCounter m_useCounter;
     Deprecation m_deprecation;
     OriginsUsingFeatures m_originsUsingFeatures;
 
     bool m_openedByDOM;
 
     bool m_tabKeyCyclesThroughElements;
     bool m_defersLoading;
 
     float m_deviceScaleFactor;
 
     PageVisibilityState m_visibilityState;
 
     bool m_isCursorVisible;
 
 #if ENABLE(ASSERT)
     bool m_isPainting;
 #endif
 
-    WillBeHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver>> m_multisamplingChangedObservers;
+    HeapHashSet<WeakMember<MultisamplingChangedObserver>> m_multisamplingChangedObservers;
 
     // A pointer to all the interfaces provided to in-process Frames for this Page.
     // FIXME: Most of the members of Page should move onto FrameHost.
-    OwnPtrWillBeMember<FrameHost> m_frameHost;
+    Member<FrameHost> m_frameHost;
 
-    OwnPtrWillBeMember<MemoryPurgeController> m_memoryPurgeController;
+    Member<MemoryPurgeController> m_memoryPurgeController;
 
     Timer<Page> m_timerForCompressStrings;
 };
 
-extern template class CORE_EXTERN_TEMPLATE_EXPORT WillBeHeapSupplement<Page>;
+extern template class CORE_EXTERN_TEMPLATE_EXPORT HeapSupplement<Page>;
 
 } // namespace blink
 
 #endif // Page_h