Add DocumentMarker::kActiveSuggestion MarkerType

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

Index: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
index 601fda49a22b29c64bdd7affdbb77d53729a0e94..f1412012b5e5685897fb5ac2cc03600380bc3c07 100644
--- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
+++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp
@@ -641,9 +641,8 @@ void InlineTextBoxPainter::PaintDocumentMarkers(
         break;
       case DocumentMarker::kTextMatch:
       case DocumentMarker::kComposition:
+      case DocumentMarker::kActiveSuggestion:
         break;
-      default:
-        continue;
     }
 
     if (marker.EndOffset() <= inline_text_box_.Start()) {
@@ -676,13 +675,16 @@ void InlineTextBoxPainter::PaintDocumentMarkers(
               paint_info, box_origin, ToTextMatchMarker(marker), style, font);
         }
         break;
-      case DocumentMarker::kComposition: {
-        const CompositionMarker& composition_marker =
-            ToCompositionMarker(marker);
+      case DocumentMarker::kComposition:
+      case DocumentMarker::kActiveSuggestion: {
+        const MarkerWithFormatting& marker_with_formatting =
+            ToMarkerWithFormatting(marker);
         CompositionUnderline underline(

[rlanday, 2017/06/02 22:42:24]

We should probably rename CompositionUnderline and all the methods like
PaintSingleCompositionBackgroundRun() since they're now also being used for
ActiveSuggestion markers. We may want to do this in (a) separate CL(s) since
this CL is already somewhat large.

[Xiaocheng, 2017/06/03 02:48:19]

Agreed.

-            composition_marker.StartOffset(), composition_marker.EndOffset(),
-            composition_marker.UnderlineColor(), composition_marker.IsThick(),
-            composition_marker.BackgroundColor());
+            marker_with_formatting.StartOffset(),
+            marker_with_formatting.EndOffset(),
+            marker_with_formatting.UnderlineColor(),
+            marker_with_formatting.IsThick(),
+            marker_with_formatting.BackgroundColor());
         if (marker_paint_phase == DocumentMarkerPaintPhase::kBackground)
           PaintSingleCompositionBackgroundRun(
               paint_info.context, box_origin, style, font,