| 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..176238ce8f14582d5b78a22b5682b951c4eb2ca5 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,13 @@ 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 StyleableMarker& styleable_marker = ToStyleableMarker(marker);
|
| CompositionUnderline underline(
|
| - composition_marker.StartOffset(), composition_marker.EndOffset(),
|
| - composition_marker.UnderlineColor(), composition_marker.IsThick(),
|
| - composition_marker.BackgroundColor());
|
| + styleable_marker.StartOffset(), styleable_marker.EndOffset(),
|
| + styleable_marker.UnderlineColor(), styleable_marker.IsThick(),
|
| + styleable_marker.BackgroundColor());
|
| if (marker_paint_phase == DocumentMarkerPaintPhase::kBackground)
|
| PaintSingleCompositionBackgroundRun(
|
| paint_info.context, box_origin, style, font,
|
|
|