Snapshot of all changes to get jumbo in blink and content.

content/renderer/input/frame_input_handler_impl.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/input/frame_input_handler_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/ime_event_guard.h"
 #include "content/renderer/input/widget_input_handler_manager.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget.h"
 #include "third_party/WebKit/public/web/WebInputMethodController.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 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:
       return blink::WebImeTextSpan::Type::kComposition;
     case ui::ImeTextSpan::Type::kSuggestion:
       return blink::WebImeTextSpan::Type::kSuggestion;
   }
 
   NOTREACHED();
   return blink::WebImeTextSpan::Type::kComposition;
@@ skipping 56 matching lines @@
     return;
   }
 
   if (!render_frame_)
     return;
 
   ImeEventGuard guard(render_frame_->GetRenderWidget());
   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,
         ime_text_span.suggestion_highlight_color, ime_text_span.suggestions);
     ime_text_spans.push_back(blink_ime_text_span);
   }
 
   render_frame_->GetWebFrame()->SetCompositionFromExistingText(start, end,
                                                                ime_text_spans);
 }
@@ skipping 339 matching lines @@
       break;
   }
 }
 
 FrameInputHandlerImpl::HandlingState::~HandlingState() {
   render_frame_->set_handling_select_range(original_select_range_value_);
   render_frame_->set_is_pasting(original_pasting_value_);
 }
 
 }  // namespace content