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

Unified Diff: third_party/WebKit/Source/core/editing/InputMethodController.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/InputMethodController.h
diff --git a/third_party/WebKit/Source/core/editing/InputMethodController.h b/third_party/WebKit/Source/core/editing/InputMethodController.h
index 535071c5fa4ce8d9105b3505bbc7e23bcc082752..67f7372e6e2596e2df147db9d5634ca603fb352b 100644
--- a/third_party/WebKit/Source/core/editing/InputMethodController.h
+++ b/third_party/WebKit/Source/core/editing/InputMethodController.h
@@ -41,8 +41,7 @@ class LocalFrame;
class Range;
class Text;
-class CORE_EXPORT InputMethodController final : public NoBaseWillBeGarbageCollectedFinalized<InputMethodController> {
- USING_FAST_MALLOC_WILL_BE_REMOVED(InputMethodController);
+class CORE_EXPORT InputMethodController final : public GarbageCollectedFinalized<InputMethodController> {
WTF_MAKE_NONCOPYABLE(InputMethodController);
public:
enum ConfirmCompositionBehavior {
@@ -50,7 +49,7 @@ public:
KeepSelection,
};
- static PassOwnPtrWillBeRawPtr<InputMethodController> create(LocalFrame&);
+ static RawPtr<InputMethodController> create(LocalFrame&);
~InputMethodController();
DECLARE_TRACE();
@@ -71,7 +70,7 @@ public:
void cancelComposition();
void cancelCompositionIfSelectionIsInvalid();
EphemeralRange compositionEphemeralRange() const;
- PassRefPtrWillBeRawPtr<Range> compositionRange() const;
+ RawPtr<Range> compositionRange() const;
void clear();
void documentDetached();
@@ -89,13 +88,13 @@ private:
explicit SelectionOffsetsScope(InputMethodController*);
~SelectionOffsetsScope();
private:
- RawPtrWillBeMember<InputMethodController> m_inputMethodController;
+ Member<InputMethodController> m_inputMethodController;
const PlainTextRange m_offsets;
};
friend class SelectionOffsetsScope;
- RawPtrWillBeMember<LocalFrame> m_frame;
- RefPtrWillBeMember<Range> m_compositionRange;
+ Member<LocalFrame> m_frame;
+ Member<Range> m_compositionRange;
bool m_isDirty;
bool m_hasComposition;

Powered by Google App Engine
This is Rietveld 408576698