Add functions searching a word boundary without VisualPosition to HTMLTextFormControlElement.

Source/core/editing/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 40 matching lines @@
 using namespace HTMLNames;
 
 namespace {
 
 bool isSelectionInTextField(const VisibleSelection& selection)
 {
     HTMLTextFormControlElement* textControl = enclosingTextFormControl(selection.start());
     return isHTMLInputElement(textControl) && toHTMLInputElement(textControl)->isTextField();
 }
 
+bool isSelectionInTextArea(const VisibleSelection& selection)
+{
+    HTMLTextFormControlElement* textControl = enclosingTextFormControl(selection.start());
+    return isHTMLTextAreaElement(textControl);
+}
+
+bool isSelectionInTextForm(const VisibleSelection& selection)

[yosin_UTC9, 2014/07/02 09:44:03]

nit: It is better to call |isSelectionInTextFormControl|. "text form" isn't
reasonable.

+{
+    return !!enclosingTextFormControl(selection.start());
+}
+
 } // namespace
 
 PassOwnPtr<SpellChecker> SpellChecker::create(LocalFrame& frame)
 {
     return adoptPtr(new SpellChecker(frame));
 }
 
 static SpellCheckerClient& emptySpellCheckerClient()
 {
     DEFINE_STATIC_LOCAL(EmptySpellCheckerClient, client, ());
@@ skipping 681 matching lines @@
 
 void SpellChecker::respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions options)
 {
     bool closeTyping = options & FrameSelection::CloseTyping;
     bool isContinuousSpellCheckingEnabled = this->isContinuousSpellCheckingEnabled();
     bool isContinuousGrammarCheckingEnabled = isContinuousSpellCheckingEnabled && isGrammarCheckingEnabled();
     if (isContinuousSpellCheckingEnabled) {
         VisibleSelection newAdjacentWords;
         VisibleSelection newSelectedSentence;
         bool caretBrowsing = m_frame.settings() && m_frame.settings()->caretBrowsingEnabled();
-        if (m_frame.selection().selection().isContentEditable() || caretBrowsing) {
-            VisiblePosition newStart(m_frame.selection().selection().visibleStart());
+        const VisibleSelection newSelection = m_frame.selection().selection();
+        if (isSelectionInTextForm(newSelection)) {
+            Position newStart = newSelection.start();
+            newAdjacentWords.setWithoutValidation(HTMLTextFormControlElement::startOfWord(newStart), HTMLTextFormControlElement::endOfWord(newStart));
+            if (isContinuousGrammarCheckingEnabled)
+                newSelectedSentence.setWithoutValidation(HTMLTextFormControlElement::startOfSentence(newStart), HTMLTextFormControlElement::endOfSentence(newStart));
+        } else if (newSelection.isContentEditable() || caretBrowsing) {
+            VisiblePosition newStart(newSelection.visibleStart());
             newAdjacentWords = VisibleSelection(startOfWord(newStart, LeftWordIfOnBoundary), endOfWord(newStart, RightWordIfOnBoundary));
             if (isContinuousGrammarCheckingEnabled)
                 newSelectedSentence = VisibleSelection(startOfSentence(newStart), endOfSentence(newStart));
         }
 
         // Don't check spelling and grammar if the change of selection is triggered by spelling correction itself.
         bool shouldCheckSpellingAndGrammar = !(options & FrameSelection::SpellCorrectionTriggered);
 
         // When typing we check spelling elsewhere, so don't redo it here.
         // If this is a change in selection resulting from a delete operation,
         // oldSelection may no longer be in the document.
         if (shouldCheckSpellingAndGrammar
             && closeTyping
-            && oldSelection.isContentEditable()
-            && oldSelection.start().inDocument()
-            && !isSelectionInTextField(oldSelection)) {
+            && !isSelectionInTextField(oldSelection)
+            && (isSelectionInTextArea(oldSelection) || oldSelection.isContentEditable())
+            && oldSelection.start().inDocument()) {
             spellCheckOldSelection(oldSelection, newAdjacentWords);
         }
 
         if (textChecker().shouldEraseMarkersAfterChangeSelection(TextCheckingTypeSpelling)) {
             if (RefPtrWillBeRawPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
                 m_frame.document()->markers().removeMarkers(wordRange.get(), DocumentMarker::Spelling);
         }
         if (textChecker().shouldEraseMarkersAfterChangeSelection(TextCheckingTypeGrammar)) {
             if (RefPtrWillBeRawPtr<Range> sentenceRange = newSelectedSentence.toNormalizedRange())
                 m_frame.document()->markers().removeMarkers(sentenceRange.get(), DocumentMarker::Grammar);
@@ skipping 106 matching lines @@
 }
 
 void SpellChecker::requestTextChecking(const Element& element)
 {
     RefPtrWillBeRawPtr<Range> rangeToCheck = rangeOfContents(const_cast<Element*>(&element));
     m_spellCheckRequester->requestCheckingFor(SpellCheckRequest::create(TextCheckingTypeSpelling | TextCheckingTypeGrammar, TextCheckingProcessBatch, rangeToCheck, rangeToCheck));
 }
 
 
 } // namespace WebCore