Remove spelling markers in disabled and readonly form elements

third_party/WebKit/Source/core/html/TextControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 19 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/iterators/CharacterIterator.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "core/editing/serializers/Serialization.h"
+#include "core/editing/spellcheck/SpellChecker.h"
 #include "core/events/Event.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLBRElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/shadow/ShadowElementNames.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutBlockFlow.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/page/FocusController.h"
@@ skipping 850 matching lines @@
 }
 
 void TextControlElement::copyNonAttributePropertiesFromElement(
     const Element& source) {
   const TextControlElement& sourceElement =
       static_cast<const TextControlElement&>(source);
   m_lastChangeWasUserEdit = sourceElement.m_lastChangeWasUserEdit;
   HTMLFormControlElement::copyNonAttributePropertiesFromElement(source);
 }
 
+void TextControlElement::disabledAttributeChanged() {
+  HTMLFormControlElement::disabledAttributeChanged();
+  removeSpellingAndGrammarMarkersOnInnerEditor();
+}
+
+void TextControlElement::readonlyAttributeChanged() {
+  HTMLFormControlElement::readonlyAttributeChanged();
+  removeSpellingAndGrammarMarkersOnInnerEditor();
+}
+
+void TextControlElement::removeSpellingAndGrammarMarkersOnInnerEditor() {

[Xiaocheng, 2017/02/03 04:54:07]

This function seems unnecessary. I think checking isDisabledOrReadOnly()
followed by calling SpellChecker::didEndEditingOnTextField() suffices.

Besides, there should be a nullptr check with document().frame(). A similar
check should also be added to fix crbug.com/687984.

+  if (isDisabledOrReadOnly()) {
+    HTMLElement* innerEditor = innerEditorElement();
+    if (innerEditor) {
+      document().frame()->spellChecker().removeSpellingAndGrammarMarkers(
+          *innerEditor);
+    }
+  }
+}
+
 }  // namespace blink