[ActiveSuggestionMarker #3] Add painting for ActiveSuggestionMarker

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/CompositionMarker.h"
 #include "core/editing/markers/DocumentMarkerController.h"
@@ skipping 623 matching lines @@
     // Paint either the background markers or the foreground markers, but not
     // both.
     switch (marker.GetType()) {
       case DocumentMarker::kGrammar:
       case DocumentMarker::kSpelling:
         if (marker_paint_phase == DocumentMarkerPaintPhase::kBackground)
           continue;
         break;
       case DocumentMarker::kTextMatch:
       case DocumentMarker::kComposition:
+      case DocumentMarker::kActiveSuggestion:
         break;
-      default:
-        continue;
     }
 
     if (marker.EndOffset() <= inline_text_box_.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;
     }
     if (marker.StartOffset() > inline_text_box_.end()) {
       // marker is completely after this run, bail.  A later run will paint it.
@@ skipping 12 matching lines @@
         break;
       case DocumentMarker::kTextMatch:
         if (marker_paint_phase == DocumentMarkerPaintPhase::kBackground) {
           inline_text_box_.PaintTextMatchMarkerBackground(
               paint_info, box_origin, ToTextMatchMarker(marker), style, font);
         } else {
           inline_text_box_.PaintTextMatchMarkerForeground(
               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 StyleableMarker& marker_with_formatting =

[yosin_UTC9, 2017/06/06 01:31:22]

Is it better to use |stylable_marker| instead of |maker_with_formatting|?

+            ToStyleableMarker(marker);
         CompositionUnderline underline(
-            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,
               underline.BackgroundColor(), UnderlinePaintStart(underline),
               UnderlinePaintEnd(underline));
         else
           PaintCompositionUnderline(paint_info.context, box_origin, underline);
       } break;
       default:
         NOTREACHED();
@@ skipping 480 matching lines @@
 
   LayoutRect box_rect(box_origin, LayoutSize(inline_text_box_.LogicalWidth(),
                                              inline_text_box_.LogicalHeight()));
   context.Clip(FloatRect(box_rect));
   context.DrawHighlightForText(font, run, FloatPoint(box_origin),
                                box_rect.Height().ToInt(), color,
                                paint_offsets.first, paint_offsets.second);
 }
 
 }  // namespace blink