Index: Source/core/editing/SpellChecker.h |
diff --git a/Source/core/editing/SpellChecker.h b/Source/core/editing/SpellChecker.h |
index a250396a34f91a0ff12f6a9ee6362874ebc6738d..549fa615966ee0c7a2d2d80a8f85a7cbaf196937 100644 |
--- a/Source/core/editing/SpellChecker.h |
+++ b/Source/core/editing/SpellChecker.h |
@@ -29,6 +29,7 @@ |
#include "core/dom/DocumentMarker.h" |
#include "core/editing/FrameSelection.h" |
#include "core/editing/VisibleSelection.h" |
+#include "platform/heap/Handle.h" |
#include "platform/text/TextChecking.h" |
namespace blink { |
@@ -41,12 +42,13 @@ class TextCheckerClient; |
class TextCheckingParagraph; |
struct TextCheckingResult; |
-class SpellChecker { |
+class SpellChecker FINAL : public NoBaseWillBeGarbageCollectedFinalized<SpellChecker> { |
WTF_MAKE_NONCOPYABLE(SpellChecker); |
public: |
- static PassOwnPtr<SpellChecker> create(LocalFrame&); |
+ static PassOwnPtrWillBeRawPtr<SpellChecker> create(LocalFrame&); |
~SpellChecker(); |
+ void trace(Visitor*); |
SpellCheckerClient& spellCheckerClient() const; |
TextCheckerClient& textChecker() const; |
@@ -62,7 +64,7 @@ public: |
void markMisspellings(const VisibleSelection&, RefPtrWillBeRawPtr<Range>& firstMisspellingRange); |
void markBadGrammar(const VisibleSelection&); |
void markMisspellingsAndBadGrammar(const VisibleSelection& spellingSelection, bool markGrammar, const VisibleSelection& grammarSelection); |
- void markAndReplaceFor(PassRefPtr<SpellCheckRequest>, const Vector<TextCheckingResult>&); |
+ void markAndReplaceFor(PassRefPtrWillBeRawPtr<SpellCheckRequest>, const Vector<TextCheckingResult>&); |
void markAllMisspellingsAndBadGrammarInRanges(TextCheckingTypeMask, Range* spellingRange, Range* grammarRange); |
void advanceToNextMisspelling(bool startBeforeSelection = false); |
void showSpellingGuessPanel(); |
@@ -88,11 +90,10 @@ public: |
SpellCheckRequester& spellCheckRequester() const { return *m_spellCheckRequester; } |
private: |
- LocalFrame& m_frame; |
- const OwnPtr<SpellCheckRequester> m_spellCheckRequester; |
- |
explicit SpellChecker(LocalFrame&); |
+ LocalFrame& frame() const { return *m_frame; } |
haraken
2014/09/22 05:35:22
Add ASSERT(m_frame).
|
+ |
void markMisspellingsOrBadGrammar(const VisibleSelection&, bool checkSpelling, RefPtrWillBeRawPtr<Range>& firstMisspellingRange); |
TextCheckingTypeMask resolveTextCheckingTypeMask(TextCheckingTypeMask); |
@@ -100,6 +101,9 @@ private: |
void chunkAndMarkAllMisspellingsAndBadGrammar(TextCheckingTypeMask textCheckingOptions, const TextCheckingParagraph& fullParagraphToCheck, bool asynchronous); |
void markAllMisspellingsAndBadGrammarInRanges(TextCheckingTypeMask textCheckingOptions, Range* checkingRange, Range* paragraphRange, bool asynchronous, int requestNumber, int* checkingLength = 0); |
+ |
+ RawPtrWillBeMember<LocalFrame> m_frame; |
+ const OwnPtrWillBeMember<SpellCheckRequester> m_spellCheckRequester; |
}; |
} // namespace blink |