Remove spelling markers when element is not editable

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 784 matching lines @@
 
 void SpellChecker::didEndEditingOnTextField(Element* e) {
   TRACE_EVENT0("blink", "SpellChecker::didEndEditingOnTextField");
 
   // Remove markers when deactivating a selection in an <input type="text"/>.
   // Prevent new ones from appearing too.
   if (!RuntimeEnabledFeatures::idleTimeSpellCheckingEnabled())
     m_spellCheckRequester->cancelCheck();
   TextControlElement* textControlElement = toTextControlElement(e);
   HTMLElement* innerEditor = textControlElement->innerEditorElement();
+  removeSpellingAndGrammarMarkers(*innerEditor);
+}
+
+void SpellChecker::removeSpellingAndGrammarMarkers(const HTMLElement& element,
+                                                   ElementsType elementsType) {
   DocumentMarker::MarkerTypes markerTypes(DocumentMarker::Spelling);
   markerTypes.add(DocumentMarker::Grammar);
-  for (Node& node : NodeTraversal::inclusiveDescendantsOf(*innerEditor))
-    frame().document()->markers().removeMarkers(&node, markerTypes);
+  for (Node& node : NodeTraversal::inclusiveDescendantsOf(element)) {
+    // TODO(editing-dev): The use of
+    // updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    frame().document()->updateStyleAndLayoutTreeForNode(&node);

[Xiaocheng, 2017/02/01 05:20:28]

This style and layout update should be placed out of the for loop.

[Manuel Rego, 2017/02/01 14:50:25]

Done.

+    if (elementsType == All || !hasEditableStyle(node))
+      frame().document()->markers().removeMarkers(&node, markerTypes);
+  }
 }
 
 void SpellChecker::replaceMisspelledRange(const String& text) {
   EphemeralRange caretRange =
       frame().selection().selection().toNormalizedEphemeralRange();
   if (caretRange.isNull())
     return;
   DocumentMarkerVector markers = frame().document()->markers().markersInRange(
       caretRange, DocumentMarker::MisspellingMarkers());
   if (markers.size() < 1 ||
@@ skipping 348 matching lines @@
         startOfNextParagraph(createVisiblePosition(paragraphEnd));
     paragraphStart = newParagraphStart.toParentAnchoredPosition();
     paragraphEnd = endOfParagraph(newParagraphStart).toParentAnchoredPosition();
     firstIteration = false;
     totalLengthProcessed += currentLength;
   }
   return std::make_pair(firstFoundItem, firstFoundOffset);
 }
 
 }  // namespace blink