| Index: third_party/WebKit/Source/core/editing/SelectionEditor.h
|
| diff --git a/third_party/WebKit/Source/core/editing/SelectionEditor.h b/third_party/WebKit/Source/core/editing/SelectionEditor.h
|
| index 2a2dab491a5da2821fc959d3b8be7d4e3668d00d..a0f7d5a7e6117ae6dbeac3b946b05f132e71e766 100644
|
| --- a/third_party/WebKit/Source/core/editing/SelectionEditor.h
|
| +++ b/third_party/WebKit/Source/core/editing/SelectionEditor.h
|
| @@ -30,19 +30,18 @@
|
|
|
| namespace blink {
|
|
|
| -class SelectionEditor final : public NoBaseWillBeGarbageCollectedFinalized<SelectionEditor>, public VisibleSelectionChangeObserver {
|
| +class SelectionEditor final : public GarbageCollectedFinalized<SelectionEditor>, public VisibleSelectionChangeObserver {
|
| WTF_MAKE_NONCOPYABLE(SelectionEditor);
|
| - USING_FAST_MALLOC_WILL_BE_REMOVED(SelectionEditor);
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SelectionEditor);
|
| + USING_GARBAGE_COLLECTED_MIXIN(SelectionEditor);
|
| public:
|
| // TODO(yosin) We should move |EAlteration| and |VerticalDirection| out
|
| // from |FrameSelection| class like |EUserTriggered|.
|
| typedef FrameSelection::EAlteration EAlteration;
|
| typedef FrameSelection::VerticalDirection VerticalDirection;
|
|
|
| - static PassOwnPtrWillBeRawPtr<SelectionEditor> create(FrameSelection& frameSelection)
|
| + static RawPtr<SelectionEditor> create(FrameSelection& frameSelection)
|
| {
|
| - return adoptPtrWillBeNoop(new SelectionEditor(frameSelection));
|
| + return (new SelectionEditor(frameSelection));
|
| }
|
| virtual ~SelectionEditor();
|
| void dispose();
|
| @@ -71,7 +70,7 @@ public:
|
| // If this FrameSelection has a logical range which is still valid, this
|
| // function return its clone. Otherwise, the return value from underlying
|
| // |VisibleSelection|'s |firstRange()| is returned.
|
| - PassRefPtrWillBeRawPtr<Range> firstRange() const;
|
| + RawPtr<Range> firstRange() const;
|
|
|
| // VisibleSelectionChangeObserver interface.
|
| void didChangeVisibleSelection() override;
|
| @@ -116,7 +115,7 @@ private:
|
| LayoutUnit lineDirectionPointForBlockDirectionNavigation(EPositionType);
|
| bool dispatchSelectStart();
|
|
|
| - RawPtrWillBeMember<FrameSelection> m_frameSelection;
|
| + Member<FrameSelection> m_frameSelection;
|
|
|
| LayoutUnit m_xPosForVerticalArrowNavigation;
|
| VisibleSelection m_selection;
|
| @@ -127,7 +126,7 @@ private:
|
| // (hence "logical"). This will be invalidated if the underlying
|
| // |VisibleSelection| changes. If that happens, this variable will
|
| // become |nullptr|, in which case logical positions == visible positions.
|
| - RefPtrWillBeMember<Range> m_logicalRange;
|
| + Member<Range> m_logicalRange;
|
| };
|
|
|
| } // namespace blink
|
|
|