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 c39849d7873813a96d987d364e2f390d1fbb6d97..01b0b6c25b59ac3edafbd7c93b7a60284978fb7f 100644 |
--- a/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp |
+++ b/third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp |
@@ -461,7 +461,10 @@ static bool paintsCompositionMarkers(const LayoutObject& layoutObject) { |
return layoutObject.node() && |
layoutObject.document() |
.markers() |
- .markersFor(layoutObject.node(), DocumentMarker::Composition) |
+ .markersFor(layoutObject.node(), |
+ DocumentMarker::Composition | |
+ DocumentMarker::Suggestion | |
+ DocumentMarker::SuggestionHighlight) |
.size() > 0; |
} |
@@ -831,6 +834,8 @@ void InlineTextBoxPainter::paintDocumentMarkers( |
break; |
case DocumentMarker::TextMatch: |
case DocumentMarker::Composition: |
+ case DocumentMarker::Suggestion: |
+ case DocumentMarker::SuggestionHighlight: |
break; |
default: |
continue; |
@@ -866,13 +871,13 @@ void InlineTextBoxPainter::paintDocumentMarkers( |
paintInfo, boxOrigin, toTextMatchMarker(marker), style, font); |
} |
break; |
- case DocumentMarker::Composition: { |
- const CompositionMarker& compositionMarker = |
- toCompositionMarker(marker); |
- CompositionUnderline underline( |
- compositionMarker.startOffset(), compositionMarker.endOffset(), |
- compositionMarker.underlineColor(), compositionMarker.thick(), |
- compositionMarker.backgroundColor()); |
+ case DocumentMarker::Composition: |
+ case DocumentMarker::Suggestion: |
+ case DocumentMarker::SuggestionHighlight: { |
+ const MarkerWithFormatting& markerWithFormatting = toMarkerWithFormatting(marker); |
+ CompositionUnderline underline(markerWithFormatting.startOffset(), markerWithFormatting.endOffset(), |
+ markerWithFormatting.underlineColor(), markerWithFormatting.thick(), |
+ markerWithFormatting.backgroundColor()); |
if (markerPaintPhase == DocumentMarkerPaintPhase::Background) |
paintSingleCompositionBackgroundRun( |
paintInfo.context, boxOrigin, style, font, |