Remove spelling markers in disabled and readonly form elements

third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/paint/InlineTextBoxPainter.h"
 
 #include "core/editing/CompositionUnderline.h"
+#include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/frame/LocalFrame.h"
+#include "core/html/HTMLFormControlElement.h"
 #include "core/layout/LayoutTextCombine.h"
 #include "core/layout/LayoutTheme.h"
 #include "core/layout/api/LineLayoutAPIShim.h"
 #include "core/layout/api/LineLayoutBox.h"
 #include "core/layout/line/InlineTextBox.h"
 #include "core/paint/PaintInfo.h"
 #include "core/paint/TextPainter.h"
 #include "core/style/AppliedTextDecoration.h"
 #include "platform/graphics/GraphicsContextStateSaver.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
@@ skipping 773 matching lines @@
                                localOrigin, selHeight, backgroundColor, sPos,
                                ePos);
 }
 
 void InlineTextBoxPainter::paintDocumentMarkers(
     const PaintInfo& paintInfo,
     const LayoutPoint& boxOrigin,
     const ComputedStyle& style,
     const Font& font,
     DocumentMarkerPaintPhase markerPaintPhase) {
-  if (!m_inlineTextBox.getLineLayoutItem().node())
+  const Node* node = m_inlineTextBox.getLineLayoutItem().node();
+  if (!node)
+    return;
+
+  if (!hasEditableStyle(*node) &&

[Xiaocheng, 2017/03/03 18:24:06]

This breaks the rendering of non-spelling markers, like textmatch.

+      (!isHTMLFormControlElement(*node) ||
+       toHTMLFormControlElement(*node).isDisabledOrReadOnly()))
     return;
 
   DCHECK(m_inlineTextBox.truncation() != cFullTruncation);
   DCHECK(m_inlineTextBox.len());
 
   DocumentMarkerVector markers =
       m_inlineTextBox.getLineLayoutItem().document().markers().markersFor(
           m_inlineTextBox.getLineLayoutItem().node());
   DocumentMarkerVector::const_iterator markerIt = markers.begin();
 
   // Give any document markers that touch this run a chance to draw before the
   // text has been drawn.  Note end() points at the last char, not one past it
   // like endOffset and ranges do.
   for (; markerIt != markers.end(); ++markerIt) {
     DCHECK(*markerIt);
     const DocumentMarker& marker = **markerIt;
 
     // Paint either the background markers or the foreground markers, but not
     // both.
     switch (marker.type()) {
       case DocumentMarker::Grammar:
       case DocumentMarker::Spelling:
         if (markerPaintPhase == DocumentMarkerPaintPhase::Background)
           continue;
         break;

[Xiaocheng, 2017/03/03 18:24:06]

The check should be added here.

       case DocumentMarker::TextMatch:
       case DocumentMarker::Composition:
         break;
       default:
         continue;
     }
 
     if (marker.endOffset() <= m_inlineTextBox.start()) {
       // marker is completely before this run.  This might be a marker that sits
       // before the first run we draw, or markers that were within runs we
@@ skipping 521 matching lines @@
 
   LayoutRect boxRect(boxOrigin, LayoutSize(m_inlineTextBox.logicalWidth(),
                                            m_inlineTextBox.logicalHeight()));
   context.clip(FloatRect(boxRect));
   context.drawHighlightForText(font, run, FloatPoint(boxOrigin),
                                boxRect.height().toInt(), color,
                                paintOffsets.first, paintOffsets.second);
 }
 
 }  // namespace blink