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

Unified Diff: third_party/WebKit/Source/core/editing/FrameSelection.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/FrameSelection.h
diff --git a/third_party/WebKit/Source/core/editing/FrameSelection.h b/third_party/WebKit/Source/core/editing/FrameSelection.h
index 75486994f9c325ece42cb3a28076edf88ccb2306..663cc0efdcff1795391e02d5c94648c504d7bae7 100644
--- a/third_party/WebKit/Source/core/editing/FrameSelection.h
+++ b/third_party/WebKit/Source/core/editing/FrameSelection.h
@@ -67,13 +67,12 @@ enum class SelectionDirectionalMode { NonDirectional, Directional };
enum class CaretVisibility;
-class CORE_EXPORT FrameSelection final : public NoBaseWillBeGarbageCollectedFinalized<FrameSelection> {
+class CORE_EXPORT FrameSelection final : public GarbageCollectedFinalized<FrameSelection> {
WTF_MAKE_NONCOPYABLE(FrameSelection);
- USING_FAST_MALLOC_WILL_BE_REMOVED(FrameSelection);
public:
- static PassOwnPtrWillBeRawPtr<FrameSelection> create(LocalFrame* frame = nullptr)
+ static RawPtr<FrameSelection> create(LocalFrame* frame = nullptr)
{
- return adoptPtrWillBeNoop(new FrameSelection(frame));
+ return new FrameSelection(frame);
}
~FrameSelection();
@@ -175,7 +174,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;
void nodeWillBeRemoved(Node&);
void didUpdateCharacterData(CharacterData*, unsigned offset, unsigned oldLength, unsigned newLength);
@@ -219,7 +218,7 @@ public:
void notifyLayoutObjectOfSelectionChange(EUserTriggered);
EditingStyle* typingStyle() const;
- void setTypingStyle(PassRefPtrWillBeRawPtr<EditingStyle>);
+ void setTypingStyle(RawPtr<EditingStyle>);
void clearTypingStyle();
String selectedHTMLForClipboard() const;
@@ -293,20 +292,20 @@ private:
bool shouldPaintCaretForTesting() const { return m_shouldPaintCaret; }
bool isPreviousCaretDirtyForTesting() const { return m_previousCaretNode; }
- RawPtrWillBeMember<LocalFrame> m_frame;
- const OwnPtrWillBeMember<PendingSelection> m_pendingSelection;
- const OwnPtrWillBeMember<SelectionEditor> m_selectionEditor;
+ Member<LocalFrame> m_frame;
+ const Member<PendingSelection> m_pendingSelection;
+ const Member<SelectionEditor> m_selectionEditor;
// Used to store base before the adjustment at bidi boundary
VisiblePosition m_originalBase;
VisiblePositionInFlatTree m_originalBaseInFlatTree;
TextGranularity m_granularity;
- RefPtrWillBeMember<Node> m_previousCaretNode; // The last node which painted the caret. Retained for clearing the old caret when it moves.
+ Member<Node> m_previousCaretNode; // The last node which painted the caret. Retained for clearing the old caret when it moves.
LayoutRect m_previousCaretRect;
CaretVisibility m_previousCaretVisibility;
- RefPtrWillBeMember<EditingStyle> m_typingStyle;
+ Member<EditingStyle> m_typingStyle;
Timer<FrameSelection> m_caretBlinkTimer;
@@ -332,7 +331,7 @@ inline void FrameSelection::clearTypingStyle()
m_typingStyle.clear();
}
-inline void FrameSelection::setTypingStyle(PassRefPtrWillBeRawPtr<EditingStyle> style)
+inline void FrameSelection::setTypingStyle(RawPtr<EditingStyle> style)
{
m_typingStyle = style;
}
« no previous file with comments | « third_party/WebKit/Source/core/editing/EphemeralRange.cpp ('k') | third_party/WebKit/Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698