Revert "Stop SpellChecker::chunkAndMarkAllMisspellingsAndBadGrammar from using TextCheckingParagrah"

third_party/WebKit/Source/core/editing/spellcheck/SpellChecker.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 309 matching lines @@
 
     const EphemeralRange& range = selection.toNormalizedEphemeralRange();
     if (range.isNull())
         return;
 
     // If we're not in an editable node, bail.
     Node* editableNode = range.startPosition().computeContainerNode();
     if (!editableNode || !hasEditableStyle(*editableNode))
         return;
 
-    chunkAndMarkAllMisspellingsAndBadGrammar(range);
+    TextCheckingParagraph fullParagraphToCheck(expandRangeToSentenceBoundary(range));
+    chunkAndMarkAllMisspellingsAndBadGrammar(fullParagraphToCheck);
 }
 
 void SpellChecker::markMisspellingsAfterApplyingCommand(const CompositeEditCommand& cmd)
 {
     if (!isSpellCheckingEnabled())
         return;
     if (!isSpellCheckingEnabledFor(cmd.endingSelection()))
         return;
 
     // Use type-based conditioning instead of polymorphism so that all spell
@@ skipping 67 matching lines @@
     const Element* focusedElement = focusedNode->isElementNode() ? toElement(focusedNode) : focusedNode->parentElement();
     if (!focusedElement)
         return false;
     return focusedElement->isSpellCheckingEnabled();
 }
 
 void SpellChecker::markMisspellingsAfterReplaceSelectionCommand(const ReplaceSelectionCommand& cmd)
 {
     TRACE_EVENT0("blink", "SpellChecker::markMisspellingsAfterReplaceSelectionCommand");
 
-    chunkAndMarkAllMisspellingsAndBadGrammar(cmd.insertedRange());
+    const EphemeralRange& insertedRange = cmd.insertedRange();
+    if (insertedRange.isNull())
+        return;
+
+    Node* node = cmd.endingSelection().rootEditableElement();
+    if (!node)
+        return;
+
+    EphemeralRange paragraphRange(Position::firstPositionInNode(node), Position::lastPositionInNode(node));
+    TextCheckingParagraph textToCheck(insertedRange, paragraphRange);
+    chunkAndMarkAllMisspellingsAndBadGrammar(textToCheck);
 }
 
-void SpellChecker::chunkAndMarkAllMisspellingsAndBadGrammar(const EphemeralRange& range)
+void SpellChecker::chunkAndMarkAllMisspellingsAndBadGrammar(const TextCheckingParagraph& fullParagraphToCheck)
 {
-    if (range.isNull())
+    if (fullParagraphToCheck.isEmpty())
         return;
-
-    Node* rootEditableElement = rootEditableElementOf(range.startPosition());
-    if (!rootEditableElement)
-        return;
-
-    const EphemeralRange& fullTextRange = EphemeralRange::rangeOfContents(*rootEditableElement);
-    int fullTextLength = TextIterator::rangeLength(fullTextRange.startPosition(), fullTextRange.endPosition());
-    if (fullTextLength <= 0)
-        return;
+    const EphemeralRange& paragraphRange = fullParagraphToCheck.paragraphRange();
 
     // Since the text may be quite big chunk it up and adjust to the sentence boundary.
     const int kChunkSize = 16 * 1024;
 
     // Check the full paragraph instead if the paragraph is short, which saves
     // the cost on sentence boundary finding.
-    if (fullTextLength <= kChunkSize) {
-        SpellCheckRequest* request = SpellCheckRequest::create(TextCheckingProcessBatch, fullTextRange, 0);
+    if (fullParagraphToCheck.rangeLength() <= kChunkSize) {
+        SpellCheckRequest* request = SpellCheckRequest::create(TextCheckingProcessBatch, paragraphRange, 0);
         if (request)
             m_spellCheckRequester->requestCheckingFor(request);
         return;
     }
 
-    CharacterIterator checkRangeIterator(range, TextIteratorEmitsObjectReplacementCharacter);
+    CharacterIterator checkRangeIterator(fullParagraphToCheck.checkingRange(), TextIteratorEmitsObjectReplacementCharacter);
     for (int requestNum = 0; !checkRangeIterator.atEnd(); requestNum++) {
         EphemeralRange chunkRange = checkRangeIterator.calculateCharacterSubrange(0, kChunkSize);
         EphemeralRange checkRange = requestNum ? expandEndToSentenceBoundary(chunkRange) : expandRangeToSentenceBoundary(chunkRange);
 
         SpellCheckRequest* request = SpellCheckRequest::create(TextCheckingProcessBatch, checkRange, requestNum);
         if (request)
             m_spellCheckRequester->requestCheckingFor(request);
 
         if (!checkRangeIterator.atEnd()) {
             checkRangeIterator.advance(1);
@@ skipping 482 matching lines @@
         VisiblePosition newParagraphStart = startOfNextParagraph(createVisiblePosition(paragraphEnd));
         paragraphStart = newParagraphStart.toParentAnchoredPosition();
         paragraphEnd = endOfParagraph(newParagraphStart).toParentAnchoredPosition();
         firstIteration = false;
         totalLengthProcessed += currentLength;
     }
     return std::make_pair(firstFoundItem, firstFoundOffset);
 }
 
 } // namespace blink