| Index: content/renderer/input/frame_input_handler_impl.cc
|
| diff --git a/content/renderer/input/frame_input_handler_impl.cc b/content/renderer/input/frame_input_handler_impl.cc
|
| index 645c45ca48c805f2a9bcf5f52887068efb1f144e..be3f0f8d741e8db2f449f7809d285e210a9db305 100644
|
| --- a/content/renderer/input/frame_input_handler_impl.cc
|
| +++ b/content/renderer/input/frame_input_handler_impl.cc
|
| @@ -21,8 +21,8 @@
|
| namespace content {
|
|
|
| namespace {
|
| -
|
| -blink::WebImeTextSpan::Type ConvertUiImeTextSpanTypeToBlinkType(
|
| +// Identical function in widget_input_handler_impl.cc
|
| +blink::WebImeTextSpan::Type FrameConvertUiImeTextSpanTypeToBlinkType(
|
| ui::ImeTextSpan::Type type) {
|
| switch (type) {
|
| case ui::ImeTextSpan::Type::kComposition:
|
| @@ -99,7 +99,7 @@ void FrameInputHandlerImpl::SetCompositionFromExistingText(
|
| std::vector<blink::WebImeTextSpan> ime_text_spans;
|
| for (const auto& ime_text_span : ui_ime_text_spans) {
|
| blink::WebImeTextSpan blink_ime_text_span(
|
| - ConvertUiImeTextSpanTypeToBlinkType(ime_text_span.type),
|
| + FrameConvertUiImeTextSpanTypeToBlinkType(ime_text_span.type),
|
| ime_text_span.start_offset, ime_text_span.end_offset,
|
| ime_text_span.underline_color, ime_text_span.thick,
|
| ime_text_span.background_color,
|
|
|