Oilpan: Remove WillBe types (part 7)

third_party/WebKit/Source/core/frame/FrameView.h

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ skipping 66 matching lines @@
 class PaintInvalidationState;
 class Page;
 class ScrollingCoordinator;
 class TracedValue;
 struct AnnotatedRegionValue;
 struct CompositedSelection;
 
 typedef unsigned long long DOMTimeStamp;
 
 class CORE_EXPORT FrameView final : public Widget, public PaintInvalidationCapableScrollableArea {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FrameView);
+    USING_GARBAGE_COLLECTED_MIXIN(FrameView);
 
     friend class PaintControllerPaintTestBase;
     friend class Internals;
     friend class LayoutPart; // for invalidateTreeIfNeeded
 
 public:
-    static PassRefPtrWillBeRawPtr<FrameView> create(LocalFrame*);
-    static PassRefPtrWillBeRawPtr<FrameView> create(LocalFrame*, const IntSize& initialSize);
+    static RawPtr<FrameView> create(LocalFrame*);
+    static RawPtr<FrameView> create(LocalFrame*, const IntSize& initialSize);
 
     ~FrameView() override;
 
     void invalidateRect(const IntRect&) override;
     void setFrameRect(const IntRect&) override;
 
     LocalFrame& frame() const
     {
         ASSERT(m_frame);
         return *m_frame;
     }
 
     Page* page() const;
 
     LayoutView* layoutView() const;
 
     void setCanHaveScrollbars(bool);
 
-    PassRefPtrWillBeRawPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
+    RawPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
 
     void setContentsSize(const IntSize&);
 
     void layout();
     bool didFirstLayout() const;
     void scheduleRelayout();
     void scheduleRelayoutOfSubtree(LayoutObject*);
     bool layoutPending() const;
     bool isInPerformLayout() const;
 
@@ skipping 180 matching lines @@
     void scrollbarStyleChanged() override;
 
     LayoutReplaced* embeddedReplacedContent() const;
 
     static void setInitialTracksPaintInvalidationsForTesting(bool);
 
     void setTracksPaintInvalidations(bool);
     bool isTrackingPaintInvalidations() const { return m_isTrackingPaintInvalidations; }
     void resetTrackedPaintInvalidations();
 
-    using ScrollableAreaSet = WillBeHeapHashSet<RawPtrWillBeMember<ScrollableArea>>;
+    using ScrollableAreaSet = HeapHashSet<Member<ScrollableArea>>;
     void addScrollableArea(ScrollableArea*);
     void removeScrollableArea(ScrollableArea*);
     const ScrollableAreaSet* scrollableAreas() const { return m_scrollableAreas.get(); }
 
     void addAnimatingScrollableArea(ScrollableArea*);
     void removeAnimatingScrollableArea(ScrollableArea*);
     const ScrollableAreaSet* animatingScrollableAreas() const { return m_animatingScrollableAreas.get(); }
 
     // With CSS style "resize:" enabled, a little resizer handle will appear at the bottom
     // right of the object. We keep track of these resizer areas for checking if touches
@@ skipping 58 matching lines @@
         const ScrollAlignment& alignY,
         ScrollType = ProgrammaticScroll) override;
 
     // The window that hosts the FrameView. The FrameView will communicate scrolls and repaints to the
     // host window in the window's coordinate space.
     HostWindow* getHostWindow() const;
 
     // Returns a clip rect in host window coordinates. Used to clip the blit on a scroll.
     IntRect windowClipRect(IncludeScrollbarsInRect = ExcludeScrollbars) const;
 
-    typedef WillBeHeapHashSet<RefPtrWillBeMember<Widget>> ChildrenWidgetSet;
+    typedef HeapHashSet<Member<Widget>> ChildrenWidgetSet;
 
     // Functions for child manipulation and inspection.
     void setParent(Widget*) override;
     void removeChild(Widget*);
-    void addChild(PassRefPtrWillBeRawPtr<Widget>);
+    void addChild(RawPtr<Widget>);
     const ChildrenWidgetSet* children() const { return &m_children; }
 
     // If the scroll view does not use a native widget, then it will have cross-platform Scrollbars. These functions
     // can be used to obtain those scrollbars.
     Scrollbar* horizontalScrollbar() const override { return m_horizontalScrollbar.get(); }
     Scrollbar* verticalScrollbar() const override { return m_verticalScrollbar.get(); }
     LayoutScrollbarPart* scrollCorner() const override { return m_scrollCorner; }
 
     void positionScrollbarLayers();
 
@@ skipping 350 matching lines @@
     LayoutViewItem layoutViewItem() const
     {
         return LayoutViewItem(this->layoutView());
     }
 
     LayoutSize m_size;
 
     typedef HashSet<RefPtr<LayoutEmbeddedObject>> EmbeddedObjectSet;
     EmbeddedObjectSet m_partUpdateSet;
 
-    // FIXME: These are just "children" of the FrameView and should be RefPtrWillBeMember<Widget> instead.
+    // FIXME: These are just "children" of the FrameView and should be Member<Widget> instead.
     HashSet<RefPtr<LayoutPart>> m_parts;
 
     // The RefPtr cycle between LocalFrame and FrameView is broken
     // when a LocalFrame is detached by LocalFrame::detach().
     // It clears the LocalFrame's m_view reference via setView(nullptr).
     //
     // For Oilpan, Member reference cycles pose no problem, but
     // LocalFrame's FrameView is also cleared by that setView(), so as to
     // keep the observable lifespan of LocalFrame::view() identical.
-    RefPtrWillBeMember<LocalFrame> m_frame;
+    Member<LocalFrame> m_frame;
 
     WebDisplayMode m_displayMode;
 
     bool m_doFullPaintInvalidation;
 
     bool m_canHaveScrollbars;
 
     bool m_hasPendingLayout;
     LayoutSubtreeRootList m_layoutSubtreeRootList;
     DepthOrderedLayoutObjectList m_orthogonalWritingModeRootList;
@@ skipping 19 matching lines @@
 
     bool m_isTrackingPaintInvalidations; // Used for testing.
 
     // TODO(wangxianzhu): Use document cycle state for spv2 and synchronzied painting.
     mutable bool m_isPainting;
 
     unsigned m_visuallyNonEmptyCharacterCount;
     unsigned m_visuallyNonEmptyPixelCount;
     bool m_isVisuallyNonEmpty;
 
-    RefPtrWillBeMember<Node> m_fragmentAnchor;
+    Member<Node> m_fragmentAnchor;
 
     // layoutObject to hold our custom scroll corner.
     LayoutScrollbarPart* m_scrollCorner;
 
-    OwnPtrWillBeMember<ScrollableAreaSet> m_scrollableAreas;
-    OwnPtrWillBeMember<ScrollableAreaSet> m_animatingScrollableAreas;
+    Member<ScrollableAreaSet> m_scrollableAreas;
+    Member<ScrollableAreaSet> m_animatingScrollableAreas;
     OwnPtr<ResizerAreaSet> m_resizerAreas;
     OwnPtr<ViewportConstrainedObjectSet> m_viewportConstrainedObjects;
     ViewportConstrainedObjectSet m_backgroundAttachmentFixedObjects;
-    OwnPtrWillBeMember<FrameViewAutoSizeInfo> m_autoSizeInfo;
+    Member<FrameViewAutoSizeInfo> m_autoSizeInfo;
 
     IntSize m_inputEventsOffsetForEmulation;
     float m_inputEventsScaleFactorForEmulation;
 
     IntSize m_layoutSize;
     bool m_layoutSizeFixedToFrameSize;
 
     Timer<FrameView> m_didScrollTimer;
 
     Vector<IntRect> m_tickmarks;
 
     float m_topControlsViewportAdjustment;
 
     bool m_needsUpdateWidgetGeometries;
     bool m_needsUpdateViewportIntersection;
     bool m_needsUpdateViewportIntersectionInSubtree;
 
 #if ENABLE(ASSERT)
     // Verified when finalizing.
     bool m_hasBeenDisposed;
 #endif
 
-    RefPtrWillBeMember<Scrollbar> m_horizontalScrollbar;
-    RefPtrWillBeMember<Scrollbar> m_verticalScrollbar;
+    Member<Scrollbar> m_horizontalScrollbar;
+    Member<Scrollbar> m_verticalScrollbar;
     ScrollbarMode m_horizontalScrollbarMode;
     ScrollbarMode m_verticalScrollbarMode;
 
     bool m_horizontalScrollbarLock;
     bool m_verticalScrollbarLock;
 
     ChildrenWidgetSet m_children;
 
     DoubleSize m_pendingScrollDelta;
     DoublePoint m_scrollPosition;
     IntSize m_contentsSize;
 
     int m_scrollbarsAvoidingResizer;
     bool m_scrollbarsSuppressed;
 
     bool m_inUpdateScrollbars;
 
     OwnPtr<LayoutAnalyzer> m_analyzer;
 
     // Mark if something has changed in the mapping from Frame to GraphicsLayer
     // and the Frame Timing regions should be recalculated.
     bool m_frameTimingRequestsDirty;
 
     // Exists only on root frame.
     // TODO(bokan): crbug.com/484188. We should specialize FrameView for the
     // main frame.
-    OwnPtrWillBeMember<ScrollableArea> m_viewportScrollableArea;
+    Member<ScrollableArea> m_viewportScrollableArea;
 
     // This frame's bounds in the root frame's content coordinates, clipped
     // recursively through every ancestor view.
     IntRect m_viewportIntersection;
     bool m_viewportIntersectionValid;
 
     // The following members control rendering pipeline throttling for this
     // frame. They are only updated in response to intersection observer
     // notifications, i.e., not in the middle of the lifecycle.
     bool m_hiddenForThrottling;
@@ skipping 36 matching lines @@
     if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
         setIsVisuallyNonEmpty();
 }
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 DEFINE_TYPE_CASTS(FrameView, ScrollableArea, scrollableArea, scrollableArea->isFrameView(), scrollableArea.isFrameView());
 
 } // namespace blink
 
 #endif // FrameView_h