| 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 88490f92b2eeba1a4e3aa842dafda0f03eebe18d..6f33f101cf1a42c9e570e45b8904c64822acb407 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
|
| @@ -113,15 +113,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);
|
| @@ -133,9 +133,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;
|
| };
|
|
|
|
|