Introduce WebInputMethodController to blink

components/test_runner/text_input_controller.cc

 // Copyright 2014 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/text_input_controller.h"
 
 #include "base/macros.h"
+#include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_view_test_proxy.h"
 #include "gin/arguments.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
+#include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "third_party/WebKit/public/web/WebInputMethodController.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebRange.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "v8/include/v8.h"
 
 namespace test_runner {
 
 class TextInputControllerBindings
@@ skipping 16 matching lines @@
   void InsertText(const std::string& text);
   void UnmarkText();
   void DoCommand(const std::string& text);
   void SetMarkedText(const std::string& text, int start, int length);
   bool HasMarkedText();
   std::vector<int> MarkedRange();
   std::vector<int> SelectedRange();
   std::vector<int> FirstRectForCharacterRange(unsigned location,
                                               unsigned length);
   void SetComposition(const std::string& text);
+  void ForceTextInputStateUpdate();
 
   base::WeakPtr<TextInputController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(TextInputControllerBindings);
 };
 
 gin::WrapperInfo TextInputControllerBindings::kWrapperInfo = {
     gin::kEmbedderNativeGin};
 
 // static
@@ skipping 28 matching lines @@
              isolate)
       .SetMethod("insertText", &TextInputControllerBindings::InsertText)
       .SetMethod("unmarkText", &TextInputControllerBindings::UnmarkText)
       .SetMethod("doCommand", &TextInputControllerBindings::DoCommand)
       .SetMethod("setMarkedText", &TextInputControllerBindings::SetMarkedText)
       .SetMethod("hasMarkedText", &TextInputControllerBindings::HasMarkedText)
       .SetMethod("markedRange", &TextInputControllerBindings::MarkedRange)
       .SetMethod("selectedRange", &TextInputControllerBindings::SelectedRange)
       .SetMethod("firstRectForCharacterRange",
                  &TextInputControllerBindings::FirstRectForCharacterRange)
-      .SetMethod("setComposition",
-                 &TextInputControllerBindings::SetComposition);
+      .SetMethod("setComposition", &TextInputControllerBindings::SetComposition)
+      .SetMethod("forceTextInputStateUpdate",
+                 &TextInputControllerBindings::ForceTextInputStateUpdate);
 }
 
 void TextInputControllerBindings::InsertText(const std::string& text) {
   if (controller_)
     controller_->InsertText(text);
 }
 
 void TextInputControllerBindings::UnmarkText() {
   if (controller_)
     controller_->UnmarkText();
@@ skipping 27 matching lines @@
     unsigned location,
     unsigned length) {
   return controller_ ? controller_->FirstRectForCharacterRange(location, length)
                      : std::vector<int>();
 }
 
 void TextInputControllerBindings::SetComposition(const std::string& text) {
   if (controller_)
     controller_->SetComposition(text);
 }
-
+void TextInputControllerBindings::ForceTextInputStateUpdate() {
+  if (controller_)
+    controller_->ForceTextInputStateUpdate();
+}
 // TextInputController ---------------------------------------------------------
 
 TextInputController::TextInputController(
     WebViewTestProxyBase* web_view_test_proxy_base)
     : web_view_test_proxy_base_(web_view_test_proxy_base),
       weak_factory_(this) {}
 
 TextInputController::~TextInputController() {}
 
 void TextInputController::Install(blink::WebLocalFrame* frame) {
   TextInputControllerBindings::Install(weak_factory_.GetWeakPtr(), frame);
 }
 
 void TextInputController::InsertText(const std::string& text) {
-  view()->commitText(blink::WebString::fromUTF8(text), 0);
+  inputMethodController()->commitText(blink::WebString::fromUTF8(text), 0);
 }
 
 void TextInputController::UnmarkText() {
-  view()->finishComposingText(blink::WebWidget::KeepSelection);
+  inputMethodController()->finishComposingText(
+      blink::WebInputMethodController::KeepSelection);
 }
 
 void TextInputController::DoCommand(const std::string& text) {
   if (view()->mainFrame()) {
     if (!view()->mainFrame()->toWebLocalFrame()) {
       CHECK(false) << "This function cannot be called if the main frame is not"
                       "a local frame.";
     }
     view()->mainFrame()->toWebLocalFrame()->executeCommand(
         blink::WebString::fromUTF8(text));
@@ skipping 18 matching lines @@
   }
   underline.thick = true;
   underlines.push_back(underline);
   if (start + length < static_cast<int>(web_text.length())) {
     underline.startOffset = underline.endOffset;
     underline.endOffset = web_text.length();
     underline.thick = false;
     underlines.push_back(underline);
   }
 
-  view()->setComposition(web_text, underlines, start, start + length);
+  inputMethodController()->setComposition(web_text, underlines, start,
+                                          start + length);
 }
 
 bool TextInputController::HasMarkedText() {
   if (!view()->mainFrame())
     return false;
 
   if (!view()->mainFrame()->toWebLocalFrame()) {
     CHECK(false) << "This function cannot be called if the main frame is not"
                     "a local frame.";
   }
@@ skipping 68 matching lines @@
 
   // The value returned by std::string::length() may not correspond to the
   // actual number of encoded characters in sequences of multi-byte or
   // variable-length characters.
   blink::WebString newText = blink::WebString::fromUTF8(text);
   size_t textLength = newText.length();
 
   std::vector<blink::WebCompositionUnderline> underlines;
   underlines.push_back(blink::WebCompositionUnderline(
       0, textLength, SK_ColorBLACK, false, SK_ColorTRANSPARENT));
-  view()->setComposition(
+  inputMethodController()->setComposition(
       newText, blink::WebVector<blink::WebCompositionUnderline>(underlines),
       textLength, textLength);
 }
 
+void TextInputController::ForceTextInputStateUpdate() {
+  web_view_test_proxy_base_->delegate()->ForceTextInputStateUpdate(
+      view()->mainFrame());
+}
+
 blink::WebView* TextInputController::view() {
   return web_view_test_proxy_base_->web_view();
 }
 
+blink::WebInputMethodController* TextInputController::inputMethodController() {
+  blink::WebLocalFrame* mainFrame = view()->mainFrame()->toWebLocalFrame();
+  if (!mainFrame) {
+    CHECK(false) << "WebView does not have a local main frame and"
+                    " cannot handle input method controller tasks.";
+  }
+  return mainFrame->frameWidget()->getActiveWebInputMethodController();
+}
+
 }  // namespace test_runner