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

Unified Diff: third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.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/spellcheck/SpellCheckRequester.h
diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h
index 0f58b1b87b7c63ade323cc09dd42428b5fad0b27..51bc92050df2b2639f41df3d38baee569cf9b8ae 100644
--- a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h
+++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.h
@@ -45,14 +45,14 @@ class TextCheckerClient;
class SpellCheckRequest final : public TextCheckingRequest {
public:
- static PassRefPtrWillBeRawPtr<SpellCheckRequest> create(TextCheckingTypeMask, TextCheckingProcessType, const EphemeralRange& checkingRange, const EphemeralRange& paragraphRange, int requestNumber = 0);
+ static RawPtr<SpellCheckRequest> create(TextCheckingTypeMask, TextCheckingProcessType, const EphemeralRange& checkingRange, const EphemeralRange& paragraphRange, int requestNumber = 0);
~SpellCheckRequest() override;
void dispose();
- PassRefPtrWillBeRawPtr<Range> checkingRange() const { return m_checkingRange; }
- PassRefPtrWillBeRawPtr<Range> paragraphRange() const { return m_paragraphRange; }
- PassRefPtrWillBeRawPtr<Element> rootEditableElement() const { return m_rootEditableElement; }
+ RawPtr<Range> checkingRange() const { return m_checkingRange; }
+ RawPtr<Range> paragraphRange() const { return m_paragraphRange; }
+ RawPtr<Element> rootEditableElement() const { return m_rootEditableElement; }
void setCheckerAndSequence(SpellCheckRequester*, int sequence);
#if !ENABLE(OILPAN)
@@ -69,22 +69,22 @@ public:
DECLARE_VIRTUAL_TRACE();
private:
- SpellCheckRequest(PassRefPtrWillBeRawPtr<Range> checkingRange, PassRefPtrWillBeRawPtr<Range> paragraphRange, const String&, TextCheckingTypeMask, TextCheckingProcessType, const Vector<uint32_t>& documentMarkersInRange, const Vector<unsigned>& documentMarkerOffsets, int requestNumber);
+ SpellCheckRequest(RawPtr<Range> checkingRange, RawPtr<Range> paragraphRange, const String&, TextCheckingTypeMask, TextCheckingProcessType, const Vector<uint32_t>& documentMarkersInRange, const Vector<unsigned>& documentMarkerOffsets, int requestNumber);
- RawPtrWillBeMember<SpellCheckRequester> m_requester;
- RefPtrWillBeMember<Range> m_checkingRange;
- RefPtrWillBeMember<Range> m_paragraphRange;
- RefPtrWillBeMember<Element> m_rootEditableElement;
+ Member<SpellCheckRequester> m_requester;
+ Member<Range> m_checkingRange;
+ Member<Range> m_paragraphRange;
+ Member<Element> m_rootEditableElement;
TextCheckingRequestData m_requestData;
int m_requestNumber;
};
-class SpellCheckRequester final : public NoBaseWillBeGarbageCollectedFinalized<SpellCheckRequester> {
- WTF_MAKE_NONCOPYABLE(SpellCheckRequester); USING_FAST_MALLOC_WILL_BE_REMOVED(SpellCheckRequester);
+class SpellCheckRequester final : public GarbageCollectedFinalized<SpellCheckRequester> {
+ WTF_MAKE_NONCOPYABLE(SpellCheckRequester);
public:
- static PassOwnPtrWillBeRawPtr<SpellCheckRequester> create(LocalFrame& frame)
+ static RawPtr<SpellCheckRequester> create(LocalFrame& frame)
{
- return adoptPtrWillBeNoop(new SpellCheckRequester(frame));
+ return new SpellCheckRequester(frame);
}
~SpellCheckRequester();
@@ -92,7 +92,7 @@ public:
bool isCheckable(Range*) const;
- void requestCheckingFor(PassRefPtrWillBeRawPtr<SpellCheckRequest>);
+ void requestCheckingFor(RawPtr<SpellCheckRequest>);
void cancelCheck();
int lastRequestSequence() const
@@ -117,15 +117,15 @@ private:
bool canCheckAsynchronously(Range*) const;
TextCheckerClient& client() const;
void timerFiredToProcessQueuedRequest(Timer<SpellCheckRequester>*);
- void invokeRequest(PassRefPtrWillBeRawPtr<SpellCheckRequest>);
- void enqueueRequest(PassRefPtrWillBeRawPtr<SpellCheckRequest>);
+ void invokeRequest(RawPtr<SpellCheckRequest>);
+ void enqueueRequest(RawPtr<SpellCheckRequest>);
void didCheckSucceed(int sequence, const Vector<TextCheckingResult>&);
void didCheckCancel(int sequence);
void didCheck(int sequence, const Vector<TextCheckingResult>&);
void clearProcessingRequest();
- RawPtrWillBeMember<LocalFrame> m_frame;
+ Member<LocalFrame> m_frame;
LocalFrame& frame() const
{
ASSERT(m_frame);
@@ -137,9 +137,9 @@ private:
Timer<SpellCheckRequester> m_timerToProcessQueuedRequest;
- RefPtrWillBeMember<SpellCheckRequest> m_processingRequest;
+ Member<SpellCheckRequest> m_processingRequest;
- typedef WillBeHeapDeque<RefPtrWillBeMember<SpellCheckRequest>> RequestQueue;
+ typedef HeapDeque<Member<SpellCheckRequest>> RequestQueue;
RequestQueue m_requestQueue;
};

Powered by Google App Engine
This is Rietveld 408576698