Introduce WebInputMethodController to blink

components/test_runner/web_widget_test_client.cc

 // Copyright 2016 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 "components/test_runner/web_widget_test_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_runner.h"
 #include "components/test_runner/test_runner_for_specific_view.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_view_test_proxy.h"
 #include "components/test_runner/web_widget_test_proxy.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
+#include "third_party/WebKit/public/web/WebFrameWidget.h"
+#include "third_party/WebKit/public/web/WebInputMethodController.h"
+#include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebPagePopup.h"
+#include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 
 namespace test_runner {
 
 WebWidgetTestClient::WebWidgetTestClient(
     TestRunner* test_runner,
     WebWidgetTestProxyBase* web_widget_test_proxy_base)
     : test_runner_(test_runner),
       web_view_test_proxy_base_(nullptr),
       web_widget_test_proxy_base_(web_widget_test_proxy_base),
@@ skipping 63 matching lines @@
 bool WebWidgetTestClient::isPointerLocked() {
   return web_view_test_proxy_base_->view_test_runner()->isPointerLocked();
 }
 
 void WebWidgetTestClient::setToolTipText(const blink::WebString& text,
                                          blink::WebTextDirection direction) {
   test_runner_->setToolTipText(text);
 }
 
 void WebWidgetTestClient::resetInputMethod() {
-  // If a composition text exists, then we need to let the browser process
-  // to cancel the input method's ongoing composition session.
-  if (web_widget_test_proxy_base_)
-    web_widget_test_proxy_base_->web_widget()->finishComposingText(
-        blink::WebWidget::KeepSelection);
+  // We should finish any ongoing composition.
+  blink::WebFrameWidget* frame_widget = nullptr;
+  if (web_widget_test_proxy_base_ &&
+      web_widget_test_proxy_base_->web_widget()->isWebFrameWidget()) {
+    frame_widget = static_cast<blink::WebFrameWidget*>(
+        web_widget_test_proxy_base_->web_widget());
+  } else if (web_view_test_proxy_base_) {
+    blink::WebLocalFrame* main_frame =
+        web_view_test_proxy_base_->web_view()->mainFrame()->toWebLocalFrame();
+    DCHECK(main_frame);
+    frame_widget = main_frame->frameWidget();
+  }
+
+  if (frame_widget && frame_widget->getActiveWebInputMethodController()) {
+    frame_widget->getActiveWebInputMethodController()->finishComposingText(
+        blink::WebInputMethodController::DoNotKeepSelection);
+  }
 }
 
 }  // namespace test_runner