Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Unified Diff: third_party/WebKit/Source/core/paint/InlineTextBoxPainter.cpp

Issue 2919173002: Add DocumentMarker::kActiveSuggestion MarkerType (Closed)
Patch Set: Fix build errors Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(
- 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,

Powered by Google App Engine
This is Rietveld 408576698