Remove underline_color from ImeTextSpan constructor
Most of the calls are just passing "black" as the underline_color,
so we can use it by default and avoid needing to pass it in every call.
Only in the few cases when we want to customize it,
we will need to do it out of the constructor.
The plan is that in a follow-up patch the default underline_color
will be changed to "transparent" in order to use the current text color
for it.
BUG=554893
Change-Id: Ie6f6d599913d8ccb634e966b7c396dbd042623bc
Reviewed-on: https://chromium-review.googlesource.com/959006
Reviewed-by: Kent Tamura <[email protected]>
Reviewed-by: Yaron Friedman <[email protected]>
Reviewed-by: Fady Samuel <[email protected]>
Reviewed-by: Shu Chen <[email protected]>
Reviewed-by: Changwan Ryu <[email protected]>
Reviewed-by: Dave Tapuska <[email protected]>
Reviewed-by: Ken Buchanan <[email protected]>
Reviewed-by: Robert Sesek <[email protected]>
Reviewed-by: Trent Apted <[email protected]>
Commit-Queue: Manuel Rego Casasnovas <[email protected]>
Cr-Commit-Position: refs/heads/master@{#545238}diff --git a/content/renderer/input/widget_input_handler_impl.cc b/content/renderer/input/widget_input_handler_impl.cc
index 0dac1c9..f08c639 100644
--- a/content/renderer/input/widget_input_handler_impl.cc
+++ b/content/renderer/input/widget_input_handler_impl.cc
@@ -25,22 +25,6 @@
namespace {
-std::vector<blink::WebImeTextSpan> ConvertUIImeTextSpansToBlinkImeTextSpans(
- const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
- std::vector<blink::WebImeTextSpan> ime_text_spans;
- for (const auto& ime_text_span : ui_ime_text_spans) {
- blink::WebImeTextSpan blink_ime_text_span(
- ConvertUiImeTextSpanTypeToWebType(ime_text_span.type),
- ime_text_span.start_offset, ime_text_span.end_offset,
- ime_text_span.underline_color,
- ConvertUiThicknessToUiImeTextSpanThickness(ime_text_span.thickness),
- ime_text_span.background_color,
- ime_text_span.suggestion_highlight_color, ime_text_span.suggestions);
- ime_text_spans.push_back(blink_ime_text_span);
- }
- return ime_text_spans;
-}
-
void RunClosureIfNotSwappedOut(base::WeakPtr<RenderWidget> render_widget,
base::OnceClosure closure) {
// Input messages must not be processed if the RenderWidget is in swapped out
@@ -112,7 +96,7 @@
int32_t end) {
RunOnMainThread(
base::BindOnce(&RenderWidget::OnImeSetComposition, render_widget_, text,
- ConvertUIImeTextSpansToBlinkImeTextSpans(ime_text_spans),
+ ConvertUiImeTextSpansToBlinkImeTextSpans(ime_text_spans),
range, start, end));
}
@@ -123,7 +107,7 @@
int32_t relative_cursor_position) {
RunOnMainThread(
base::BindOnce(&RenderWidget::OnImeCommitText, render_widget_, text,
- ConvertUIImeTextSpansToBlinkImeTextSpans(ime_text_spans),
+ ConvertUiImeTextSpansToBlinkImeTextSpans(ime_text_spans),
range, relative_cursor_position));
}
