[WIP] Add support for Android SuggestionSpans when editing text

content/renderer/render_widget.cc

 // Copyright (c) 2012 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/render_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 578 matching lines @@
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderWidget, message)
     IPC_MESSAGE_HANDLER(InputMsg_HandleInputEvent, OnHandleInputEvent)
     IPC_MESSAGE_HANDLER(InputMsg_CursorVisibilityChange,
                         OnCursorVisibilityChange)
     IPC_MESSAGE_HANDLER(InputMsg_ImeSetComposition, OnImeSetComposition)
     IPC_MESSAGE_HANDLER(InputMsg_ImeCommitText, OnImeCommitText)
     IPC_MESSAGE_HANDLER(InputMsg_ImeFinishComposingText,
                         OnImeFinishComposingText)
+    IPC_MESSAGE_HANDLER(InputMsg_ApplySuggestionReplacement,
+                        OnApplySuggestionReplacement)

[esprehn, 2017/01/31 22:41:34]

Please use mojo.

[rlanday, 2017/01/31 23:30:09]

Ok

+    IPC_MESSAGE_HANDLER(InputMsg_DeleteSuggestionHighlight,
+                        OnDeleteSuggestionHighlight)
+    IPC_MESSAGE_HANDLER(InputMsg_SuggestionMenuClosed, OnSuggestionMenuClosed)
     IPC_MESSAGE_HANDLER(InputMsg_MouseCaptureLost, OnMouseCaptureLost)
     IPC_MESSAGE_HANDLER(InputMsg_SetEditCommandsForNextKeyEvent,
                         OnSetEditCommandsForNextKeyEvent)
     IPC_MESSAGE_HANDLER(InputMsg_SetFocus, OnSetFocus)
     IPC_MESSAGE_HANDLER(InputMsg_SyntheticGestureCompleted,
                         OnSyntheticGestureCompleted)
     IPC_MESSAGE_HANDLER(ViewMsg_Close, OnClose)
     IPC_MESSAGE_HANDLER(ViewMsg_Resize, OnResize)
     IPC_MESSAGE_HANDLER(ViewMsg_EnableDeviceEmulation,
                         OnEnableDeviceEmulation)
@@ skipping 1009 matching lines @@
   input_handler_->set_handling_input_event(true);
   if (auto* controller = GetInputMethodController()) {
     controller->finishComposingText(
         keep_selection ? WebInputMethodController::KeepSelection
                        : WebInputMethodController::DoNotKeepSelection);
   }
   input_handler_->set_handling_input_event(false);
   UpdateCompositionInfo(false /* not an immediate request */);
 }
 
+void RenderWidget::OnApplySuggestionReplacement(int document_marker_id,
+                                                int suggestion_index) {
+  if (auto* controller = GetInputMethodController()) {
+    controller->applySuggestionReplacement(document_marker_id,
+                                           suggestion_index);
+  }
+}
+
+void RenderWidget::OnDeleteSuggestionHighlight() {
+  if (auto* controller = GetInputMethodController()) {
+    controller->deleteSuggestionHighlight();
+  }
+}
+
+void RenderWidget::OnSuggestionMenuClosed() {
+  if (auto* controller = GetInputMethodController())
+    controller->suggestionMenuClosed();
+}
+
 void RenderWidget::OnDeviceScaleFactorChanged() {
   if (!compositor_)
     return;
   if (IsUseZoomForDSFEnabled())
     compositor_->SetPaintedDeviceScaleFactor(GetOriginalDeviceScaleFactor());
   else
     compositor_->setDeviceScaleFactor(device_scale_factor_);
 }
 
 void RenderWidget::OnRepaint(gfx::Size size_to_paint) {
@@ skipping 457 matching lines @@
       break;
     default:
       web_screen_info.orientationType =
           blink::WebScreenOrientationUndefined;
       break;
   }
   web_screen_info.orientationAngle = screen_info_.orientation_angle;
   return web_screen_info;
 }
 
+void RenderWidget::handlePotentialTextSuggestionTap() {
+  blink::WebInputMethodController* controller = GetInputMethodController();
+  if (!controller)
+    return;
+
+  WebVector<blink::WebTextSuggestionInfo> suggestion_infos =
+      controller->getTextSuggestionInfosUnderCaret();
+
+  if (suggestion_infos.size() == 0)
+    return;
+
+  // The composition is now on the suggestion range highlight
+  UpdateCompositionInfo(false /* not an immediate request */);
+
+  controller->prepareForTextSuggestionMenuToBeShown();

[esprehn, 2017/01/31 22:41:34]

This should all be done with mojo inside blink.

[rlanday, 2017/01/31 23:30:09]

Ok

[rlanday, 2017/02/17 01:46:20]

Is there a way to get access to the RenderWidget from LocalFrame (which is what
InputMethodController has access to, and it's what my new
TextSuggestionController class has access to) to call UpdateCompositionInfo()?

+
+  Send(new InputHostMsg_ShowTextSuggestionMenu(
+      routing_id(), std::vector<blink::WebTextSuggestionInfo>(
+                        suggestion_infos.begin(), suggestion_infos.end())));
+}
+
 void RenderWidget::resetInputMethod() {
   ImeEventGuard guard(this);
   Send(new InputHostMsg_ImeCancelComposition(routing_id()));
 
   UpdateCompositionInfo(false /* not an immediate request */);
 }
 
 #if defined(OS_ANDROID)
 void RenderWidget::showUnhandledTapUIIfNeeded(
     const WebPoint& tapped_position,
@@ skipping 166 matching lines @@
     // browser side (https://crbug.com/669219).
     // If there is no WebFrameWidget, then there will be no
     // InputMethodControllers for a WebLocalFrame.
     return nullptr;
   }
   return static_cast<blink::WebFrameWidget*>(GetWebWidget())
       ->getActiveWebInputMethodController();
 }
 
 }  // namespace content