| Index: third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
|
| index 7261ec8b9a339c1e90955a9c4e627ef555e241d3..be1ba476f7d1daf94819cc91895f21404c10d246 100644
|
| --- a/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/spellcheck/SpellCheckRequester.cpp
|
| @@ -42,14 +42,12 @@ SpellCheckRequest::SpellCheckRequest(
|
| const String& text,
|
| TextCheckingTypeMask mask,
|
| TextCheckingProcessType processType,
|
| - const Vector<uint32_t>& documentMarkersInRange,
|
| - const Vector<unsigned>& documentMarkerOffsets,
|
| int requestNumber)
|
| : m_requester(nullptr)
|
| , m_checkingRange(checkingRange)
|
| , m_paragraphRange(paragraphRange)
|
| , m_rootEditableElement(blink::rootEditableElement(*m_checkingRange->startContainer()))
|
| - , m_requestData(unrequestedTextCheckingSequence, text, mask, processType, documentMarkersInRange, documentMarkerOffsets)
|
| + , m_requestData(unrequestedTextCheckingSequence, text, mask, processType)
|
| , m_requestNumber(requestNumber)
|
| {
|
| DCHECK(m_checkingRange);
|
| @@ -100,15 +98,7 @@ SpellCheckRequest* SpellCheckRequest::create(TextCheckingTypeMask textCheckingOp
|
| else
|
| paragraphRangeObject = createRange(paragraphRange);
|
|
|
| - const DocumentMarkerVector& markers = checkingRangeObject->ownerDocument().markers().markersInRange(checkingRange, DocumentMarker::SpellCheckClientMarkers());
|
| - Vector<uint32_t> hashes(markers.size());
|
| - Vector<unsigned> offsets(markers.size());
|
| - for (size_t i = 0; i < markers.size(); ++i) {
|
| - hashes[i] = markers[i]->hash();
|
| - offsets[i] = markers[i]->startOffset();
|
| - }
|
| -
|
| - return new SpellCheckRequest(checkingRangeObject, paragraphRangeObject, text, textCheckingOptions, processType, hashes, offsets, requestNumber);
|
| + return new SpellCheckRequest(checkingRangeObject, paragraphRangeObject, text, textCheckingOptions, processType, requestNumber);
|
| }
|
|
|
| const TextCheckingRequestData& SpellCheckRequest::data() const
|
| @@ -287,7 +277,7 @@ void SpellCheckRequester::didCheckSucceed(int sequence, const Vector<TextCheckin
|
| {
|
| TextCheckingRequestData requestData = m_processingRequest->data();
|
| if (requestData.sequence() == sequence) {
|
| - DocumentMarker::MarkerTypes markers = DocumentMarker::SpellCheckClientMarkers();
|
| + DocumentMarker::MarkerTypes markers = DocumentMarker::MisspellingMarkers();
|
| if (!requestData.maskContains(TextCheckingTypeSpelling))
|
| markers.remove(DocumentMarker::Spelling);
|
| if (!requestData.maskContains(TextCheckingTypeGrammar))
|
|
|