[WIP] Add support for Android SuggestionSpans when editing text

content/renderer/render_widget.cc

Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 141f81153e97c6bfaafddeb4f06db768d7277dae..63e5714a57fcec4843cbd66957c6cf7ecdb42c65 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -86,6 +86,7 @@
 #include "third_party/WebKit/public/web/WebPopupMenuInfo.h"
 #include "third_party/WebKit/public/web/WebRange.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
+#include "third_party/WebKit/public/web/WebTextSuggestionController.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "third_party/skia/include/core/SkShader.h"
@@ -1592,7 +1593,7 @@ void RenderWidget::OnImeSetComposition(
     // sure we are in a consistent state.
     Send(new InputHostMsg_ImeCancelComposition(routing_id()));
   }
-  UpdateCompositionInfo(false /* not an immediate request */);
+  updateCompositionInfo(false /* not an immediate request */);
 }
 
 void RenderWidget::OnImeCommitText(
@@ -1622,7 +1623,7 @@ void RenderWidget::OnImeCommitText(
         relative_cursor_pos);
   }
   input_handler_->set_handling_input_event(false);
-  UpdateCompositionInfo(false /* not an immediate request */);
+  updateCompositionInfo(false /* not an immediate request */);
 }
 
 void RenderWidget::OnImeFinishComposingText(bool keep_selection) {
@@ -1647,7 +1648,7 @@ void RenderWidget::OnImeFinishComposingText(bool keep_selection) {
                        : WebInputMethodController::DoNotKeepSelection);
   }
   input_handler_->set_handling_input_event(false);
-  UpdateCompositionInfo(false /* not an immediate request */);
+  updateCompositionInfo(false /* not an immediate request */);
 }
 
 void RenderWidget::OnDeviceScaleFactorChanged() {
@@ -1817,11 +1818,11 @@ ui::TextInputType RenderWidget::GetTextInputType() {
   return ui::TEXT_INPUT_TYPE_NONE;
 }
 
-void RenderWidget::UpdateCompositionInfo(bool immediate_request) {
+void RenderWidget::updateCompositionInfo(bool immediate_request) {
   if (!monitor_composition_info_ && !immediate_request)
     return;  // Do not calculate composition info if not requested.
 
-  TRACE_EVENT0("renderer", "RenderWidget::UpdateCompositionInfo");
+  TRACE_EVENT0("renderer", "RenderWidget::updateCompositionInfo");
   gfx::Range range;
   std::vector<gfx::Rect> character_bounds;
 
@@ -1879,7 +1880,7 @@ void RenderWidget::OnRequestCompositionUpdates(bool immediate_request,
   monitor_composition_info_ = monitor_updates;
   if (!immediate_request)
     return;
-  UpdateCompositionInfo(true /* immediate request */);
+  updateCompositionInfo(true /* immediate request */);
 }
 
 void RenderWidget::OnSetDeviceScaleFactor(float device_scale_factor) {
@@ -2016,7 +2017,7 @@ void RenderWidget::UpdateSelectionBounds() {
     }
   }
 
-  UpdateCompositionInfo(false /* not an immediate request */);
+  updateCompositionInfo(false /* not an immediate request */);
 }
 
 void RenderWidget::DidAutoResize(const gfx::Size& new_size) {