Add support for persisting CompositionUnderlines in InputMethodController

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/Editor.h"
 #include "core/editing/markers/DocumentMarkerController.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 372 matching lines @@
 bool InlineTextBoxPainter::paintsMarkerHighlights(
     const LayoutObject& layoutObject) {
   return layoutObject.node() &&
          layoutObject.document().markers().hasMarkers(layoutObject.node());
 }
 
 static bool paintsCompositionMarkers(const LayoutObject& layoutObject) {
   return layoutObject.node() &&
          layoutObject.document()
                  .markers()
-                 .markersFor(layoutObject.node(), DocumentMarker::Composition)
+                 .markersFor(layoutObject.node(),
+                             DocumentMarker::Composition |
+                                 DocumentMarker::PersistingComposition)
                  .size() > 0;
 }
 
 void InlineTextBoxPainter::paint(const PaintInfo& paintInfo,
                                  const LayoutPoint& paintOffset) {
   if (!shouldPaintTextBox(paintInfo))
     return;
 
   DCHECK(!shouldPaintSelfOutline(paintInfo.phase) &&
          !shouldPaintDescendantOutlines(paintInfo.phase));
@@ skipping 352 matching lines @@
     // 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;
       case DocumentMarker::TextMatch:
       case DocumentMarker::Composition:
+      case DocumentMarker::PersistingComposition:
         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
       // skipped due to truncation.
       continue;
@@ skipping 14 matching lines @@
                                             marker, style, font, true);
         break;
       case DocumentMarker::TextMatch:
         if (markerPaintPhase == DocumentMarkerPaintPhase::Background)
           m_inlineTextBox.paintTextMatchMarkerBackground(paintInfo, boxOrigin,
                                                          marker, style, font);
         else
           m_inlineTextBox.paintTextMatchMarkerForeground(paintInfo, boxOrigin,
                                                          marker, style, font);
         break;
-      case DocumentMarker::Composition: {
-        CompositionUnderline underline(marker.startOffset(), marker.endOffset(),
-                                       marker.underlineColor(), marker.thick(),
-                                       marker.backgroundColor());
+      case DocumentMarker::Composition:
+      case DocumentMarker::PersistingComposition: {
+        CompositionUnderline underline(
+            marker.startOffset(), marker.endOffset(), marker.underlineColor(),
+            marker.thick(), marker.backgroundColor(),
+            (marker.type() == DocumentMarker::PersistingComposition));
         if (markerPaintPhase == DocumentMarkerPaintPhase::Background)
           paintSingleCompositionBackgroundRun(
               paintInfo.context, boxOrigin, style, font,
               underline.backgroundColor(), underlinePaintStart(underline),
               underlinePaintEnd(underline));
         else
           paintCompositionUnderline(paintInfo.context, boxOrigin, underline);
       } break;
       default:
         ASSERT_NOT_REACHED();
@@ skipping 462 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