Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Unified Diff: third_party/WebKit/Source/core/editing/SelectionEditor.h

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5f81fa864fc68e97d49bf4e264f81c037410f38c..29e028425e305bba9d2a08cab9af31cdce7298f7 100644
--- a/third_party/WebKit/Source/core/editing/SelectionEditor.h
+++ b/third_party/WebKit/Source/core/editing/SelectionEditor.h
@@ -31,19 +31,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();
@@ -72,7 +71,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;
@@ -114,7 +113,7 @@ private:
LayoutUnit lineDirectionPointForBlockDirectionNavigation(EPositionType);
DispatchEventResult dispatchSelectStart();
- RawPtrWillBeMember<FrameSelection> m_frameSelection;
+ Member<FrameSelection> m_frameSelection;
LayoutUnit m_xPosForVerticalArrowNavigation;
VisibleSelection m_selection;
@@ -125,7 +124,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

Powered by Google App Engine
This is Rietveld 408576698