Add/remove spell checking markers in text inputs depending on focus.

Source/core/editing/Editor.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 44 matching lines @@
 #include "core/editing/ReplaceSelectionCommand.h"
 #include "core/editing/SimplifyMarkupCommand.h"
 #include "core/editing/SpellChecker.h"
 #include "core/editing/TextCheckingHelper.h"
 #include "core/editing/TextIterator.h"
 #include "core/editing/TypingCommand.h"
 #include "core/editing/VisibleUnits.h"
 #include "core/editing/htmlediting.h"
 #include "core/editing/markup.h"
 #include "core/html/HTMLImageElement.h"
+#include "core/html/HTMLInputElement.h"
 #include "core/html/HTMLTextAreaElement.h"
 #include "core/loader/cache/ResourceFetcher.h"
 #include "core/page/EditorClient.h"
 #include "core/page/EventHandler.h"
 #include "core/page/FocusController.h"
 #include "core/page/Frame.h"
 #include "core/page/FrameView.h"
 #include "core/page/Page.h"
 #include "core/page/Settings.h"
 #include "core/platform/KillRing.h"
 #include "core/platform/Pasteboard.h"
 #include "core/platform/Sound.h"
 #include "core/platform/text/TextCheckerClient.h"
 #include "core/rendering/HitTestResult.h"
 #include "core/rendering/RenderBlock.h"
 #include "core/rendering/RenderTextControl.h"
 #include "wtf/unicode/CharacterNames.h"
 
 namespace WebCore {
 
 using namespace std;
 using namespace HTMLNames;
 using namespace WTF;
 using namespace Unicode;
 
+namespace {
+
+bool isSelectionInTextField(const VisibleSelection& selection)
+{
+    HTMLTextFormControlElement* textControl = enclosingTextFormControl(selection.start());
+    return textControl && textControl->hasTagName(inputTag) && toHTMLInputElement(textControl)->isTextField();
+}
+
+} // namespace
+
 // When an event handler has moved the selection outside of a text control
 // we should use the target control's selection for this editing operation.
 VisibleSelection Editor::selectionForCommand(Event* event)
 {
     VisibleSelection selection = m_frame->selection()->selection();
     if (!event)
         return selection;
     // If the target is a text control, and the current selection is outside of its shadow tree,
     // then use the saved selection for that text control.
     HTMLTextFormControlElement* textFormControlOfSelectionStart = enclosingTextFormControl(selection.start());
@@ skipping 1968 matching lines @@
 
     // Handle block styles, substracting these from the typing style.
     RefPtr<EditingStyle> blockStyle = typingStyle->extractAndRemoveBlockProperties();
     if (!blockStyle->isEmpty())
         applyCommand(ApplyStyleCommand::create(m_frame->document(), blockStyle.get(), editingAction));
 
     // Set the remaining style as the typing style.
     m_frame->selection()->setTypingStyle(typingStyle);
 }
 
+
+void Editor::textFieldDidBeginEditing(Element* e)
+{
+    if (isContinuousSpellCheckingEnabled()) {
+        Element* element = toHTMLTextFormControlElement(e)->innerTextElement();
+        VisibleSelection selection = VisibleSelection::selectionFromContentsOfNode(element);
+        markMisspellingsAndBadGrammar(selection);
+    }
+}
+
 void Editor::textFieldDidEndEditing(Element* e)
 {
+    // Remove markers when deactivating a selection in an <input type="text"/>.
+    // Prevent new ones from appearing too.
+    m_spellChecker->cancelProcessingRequest();
+    HTMLTextFormControlElement* textFormControlElement = toHTMLTextFormControlElement(e);
+    HTMLElement* innerText = textFormControlElement->innerTextElement();
+    DocumentMarker::MarkerTypes markerTypes(DocumentMarker::Spelling);
+    if (isGrammarCheckingEnabled())

[please use gerrit instead, 2013/07/30 21:32:00]

Also check for unified spellchecker setting. If unified checking is enabled,
then you should remove both grammar and spelling marker types.

+        markerTypes.add(DocumentMarker::Grammar);
+    for (Node* node = innerText; node; node = NodeTraversal::next(node, innerText)) {
+        m_frame->document()->markers()->removeMarkers(node, markerTypes);
+    }
+
     if (client())
         client()->textFieldDidEndEditing(e);
 }
 
 void Editor::textDidChangeInTextField(Element* e)
 {
     if (client())
         client()->textDidChangeInTextField(e);
 }
 
@@ skipping 155 matching lines @@
             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().deprecatedNode() && oldSelection.start().anchorNode()->inDocument()) {
+        if (shouldCheckSpellingAndGrammar && closeTyping && oldSelection.isContentEditable() && oldSelection.start().deprecatedNode() && oldSelection.start().anchorNode()->inDocument()
+            && !isSelectionInTextField(oldSelection)) {

[please use gerrit instead, 2013/07/30 21:32:00]

We don't go through code looking for style violations, but if you're editing a
line of code that does not adhere to style guidelines, then it's OK to modify
the style to match the guidelines. In this particular example, the line expands
more than 125 characters. I believe that Blink style mandates 125 character
lines. (Correct me, if I'm wrong.) Please modify this line as follows:

    if (shouldCheckSpellingAndGrammar &&
        closeTyping &&
        oldSelection.isContentEditable() &&
        oldSelection.start().deprecatedNode() &&
        oldSelection.start().anchorNode()->inDocument() &&
        !isSelectionInTextField(oldSelection)) {
        ...
    }

(&& and || go at the end of the line.)

[pstanek, 2013/07/30 21:50:39]

Been there. && and || on the right is something presubmit checks complain about.

[please use gerrit instead, 2013/07/30 21:57:01]

Presubmit checks are usually correct. Do what they ask :-). (I might be mixing
in Chromium style in here, sorry.)

             VisiblePosition oldStart(oldSelection.visibleStart());
             VisibleSelection oldAdjacentWords = VisibleSelection(startOfWord(oldStart, LeftWordIfOnBoundary), endOfWord(oldStart, RightWordIfOnBoundary));
             if (oldAdjacentWords != newAdjacentWords) {
                 if (isContinuousGrammarCheckingEnabled) {
                     VisibleSelection oldSelectedSentence = VisibleSelection(startOfSentence(oldStart), endOfSentence(oldStart));
                     markMisspellingsAndBadGrammar(oldAdjacentWords, oldSelectedSentence != newSelectedSentence, oldSelectedSentence);
                 } else
                     markMisspellingsAndBadGrammar(oldAdjacentWords, false, oldAdjacentWords);
             }
         }
@@ skipping 74 matching lines @@
     return WebCore::unifiedTextCheckerEnabled(m_frame);
 }
 
 void Editor::toggleOverwriteModeEnabled()
 {
     m_overwriteModeEnabled = !m_overwriteModeEnabled;
     frame()->selection()->setShouldShowBlockCursor(m_overwriteModeEnabled);
 };
 
 } // namespace WebCore