| Index: components/test_runner/text_input_controller.cc
|
| diff --git a/components/test_runner/text_input_controller.cc b/components/test_runner/text_input_controller.cc
|
| deleted file mode 100644
|
| index 2cdfd66b2f4a3ac6f68e3c920137bf6f067212f1..0000000000000000000000000000000000000000
|
| --- a/components/test_runner/text_input_controller.cc
|
| +++ /dev/null
|
| @@ -1,346 +0,0 @@
|
| -// 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/platform/WebCoalescedInputEvent.h"
|
| -#include "third_party/WebKit/public/platform/WebInputEventResult.h"
|
| -#include "third_party/WebKit/public/platform/WebKeyboardEvent.h"
|
| -#include "third_party/WebKit/public/web/WebCompositionUnderline.h"
|
| -#include "third_party/WebKit/public/web/WebFrameWidget.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 "ui/events/base_event_utils.h"
|
| -#include "v8/include/v8.h"
|
| -
|
| -namespace test_runner {
|
| -
|
| -class TextInputControllerBindings
|
| - : public gin::Wrappable<TextInputControllerBindings> {
|
| - public:
|
| - static gin::WrapperInfo kWrapperInfo;
|
| -
|
| - static void Install(base::WeakPtr<TextInputController> controller,
|
| - blink::WebLocalFrame* frame);
|
| -
|
| - private:
|
| - explicit TextInputControllerBindings(
|
| - base::WeakPtr<TextInputController> controller);
|
| - ~TextInputControllerBindings() override;
|
| -
|
| - // gin::Wrappable:
|
| - gin::ObjectTemplateBuilder GetObjectTemplateBuilder(
|
| - v8::Isolate* isolate) override;
|
| -
|
| - 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
|
| -void TextInputControllerBindings::Install(
|
| - base::WeakPtr<TextInputController> controller,
|
| - blink::WebLocalFrame* frame) {
|
| - v8::Isolate* isolate = blink::mainThreadIsolate();
|
| - v8::HandleScope handle_scope(isolate);
|
| - v8::Local<v8::Context> context = frame->mainWorldScriptContext();
|
| - if (context.IsEmpty())
|
| - return;
|
| -
|
| - v8::Context::Scope context_scope(context);
|
| -
|
| - gin::Handle<TextInputControllerBindings> bindings =
|
| - gin::CreateHandle(isolate, new TextInputControllerBindings(controller));
|
| - if (bindings.IsEmpty())
|
| - return;
|
| - v8::Local<v8::Object> global = context->Global();
|
| - global->Set(gin::StringToV8(isolate, "textInputController"), bindings.ToV8());
|
| -}
|
| -
|
| -TextInputControllerBindings::TextInputControllerBindings(
|
| - base::WeakPtr<TextInputController> controller)
|
| - : controller_(controller) {}
|
| -
|
| -TextInputControllerBindings::~TextInputControllerBindings() {}
|
| -
|
| -gin::ObjectTemplateBuilder
|
| -TextInputControllerBindings::GetObjectTemplateBuilder(v8::Isolate* isolate) {
|
| - return gin::Wrappable<TextInputControllerBindings>::GetObjectTemplateBuilder(
|
| - 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("forceTextInputStateUpdate",
|
| - &TextInputControllerBindings::ForceTextInputStateUpdate);
|
| -}
|
| -
|
| -void TextInputControllerBindings::InsertText(const std::string& text) {
|
| - if (controller_)
|
| - controller_->InsertText(text);
|
| -}
|
| -
|
| -void TextInputControllerBindings::UnmarkText() {
|
| - if (controller_)
|
| - controller_->UnmarkText();
|
| -}
|
| -
|
| -void TextInputControllerBindings::DoCommand(const std::string& text) {
|
| - if (controller_)
|
| - controller_->DoCommand(text);
|
| -}
|
| -
|
| -void TextInputControllerBindings::SetMarkedText(const std::string& text,
|
| - int start,
|
| - int length) {
|
| - if (controller_)
|
| - controller_->SetMarkedText(text, start, length);
|
| -}
|
| -
|
| -bool TextInputControllerBindings::HasMarkedText() {
|
| - return controller_ ? controller_->HasMarkedText() : false;
|
| -}
|
| -
|
| -std::vector<int> TextInputControllerBindings::MarkedRange() {
|
| - return controller_ ? controller_->MarkedRange() : std::vector<int>();
|
| -}
|
| -
|
| -std::vector<int> TextInputControllerBindings::SelectedRange() {
|
| - return controller_ ? controller_->SelectedRange() : std::vector<int>();
|
| -}
|
| -
|
| -std::vector<int> TextInputControllerBindings::FirstRectForCharacterRange(
|
| - 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) {
|
| - if (auto* controller = GetInputMethodController()) {
|
| - controller->commitText(blink::WebString::fromUTF8(text),
|
| - std::vector<blink::WebCompositionUnderline>(),
|
| - blink::WebRange(), 0);
|
| - }
|
| -}
|
| -
|
| -void TextInputController::UnmarkText() {
|
| - if (auto* controller = GetInputMethodController()) {
|
| - controller->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));
|
| - }
|
| -}
|
| -
|
| -void TextInputController::SetMarkedText(const std::string& text,
|
| - int start,
|
| - int length) {
|
| - blink::WebString web_text(blink::WebString::fromUTF8(text));
|
| -
|
| - // Split underline into up to 3 elements (before, selection, and after).
|
| - std::vector<blink::WebCompositionUnderline> underlines;
|
| - blink::WebCompositionUnderline underline;
|
| - if (!start) {
|
| - underline.endOffset = length;
|
| - } else {
|
| - underline.endOffset = start;
|
| - underlines.push_back(underline);
|
| - underline.startOffset = start;
|
| - underline.endOffset = start + length;
|
| - }
|
| - 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);
|
| - }
|
| -
|
| - if (auto* controller = GetInputMethodController()) {
|
| - controller->setComposition(web_text, underlines, blink::WebRange(), 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.";
|
| - }
|
| -
|
| - return view()->mainFrame()->toWebLocalFrame()->hasMarkedText();
|
| -}
|
| -
|
| -std::vector<int> TextInputController::MarkedRange() {
|
| - if (!view()->mainFrame())
|
| - return std::vector<int>();
|
| -
|
| - if (!view()->mainFrame()->toWebLocalFrame()) {
|
| - CHECK(false) << "This function cannot be called if the main frame is not"
|
| - "a local frame.";
|
| - }
|
| -
|
| - blink::WebRange range = view()->mainFrame()->toWebLocalFrame()->markedRange();
|
| - std::vector<int> int_array(2);
|
| - int_array[0] = range.startOffset();
|
| - int_array[1] = range.endOffset();
|
| -
|
| - return int_array;
|
| -}
|
| -
|
| -std::vector<int> TextInputController::SelectedRange() {
|
| - if (!view()->mainFrame())
|
| - return std::vector<int>();
|
| -
|
| - if (!view()->mainFrame()->toWebLocalFrame()) {
|
| - CHECK(false) << "This function cannot be called if the main frame is not"
|
| - "a local frame.";
|
| - }
|
| -
|
| - blink::WebRange range =
|
| - view()->mainFrame()->toWebLocalFrame()->selectionRange();
|
| - if (range.isNull())
|
| - return std::vector<int>();
|
| - std::vector<int> int_array(2);
|
| - int_array[0] = range.startOffset();
|
| - int_array[1] = range.endOffset();
|
| -
|
| - return int_array;
|
| -}
|
| -
|
| -std::vector<int> TextInputController::FirstRectForCharacterRange(
|
| - unsigned location,
|
| - unsigned length) {
|
| - blink::WebRect rect;
|
| - if (!view()->focusedFrame() ||
|
| - !view()->focusedFrame()->firstRectForCharacterRange(location, length,
|
| - rect)) {
|
| - return std::vector<int>();
|
| - }
|
| -
|
| - std::vector<int> int_array(4);
|
| - int_array[0] = rect.x;
|
| - int_array[1] = rect.y;
|
| - int_array[2] = rect.width;
|
| - int_array[3] = rect.height;
|
| -
|
| - return int_array;
|
| -}
|
| -
|
| -void TextInputController::SetComposition(const std::string& text) {
|
| - // Sends a keydown event with key code = 0xE5 to emulate input method
|
| - // behavior.
|
| - blink::WebKeyboardEvent key_down(
|
| - blink::WebInputEvent::RawKeyDown, blink::WebInputEvent::NoModifiers,
|
| - ui::EventTimeStampToSeconds(ui::EventTimeForNow()));
|
| -
|
| - key_down.windowsKeyCode = 0xE5; // VKEY_PROCESSKEY
|
| - view()->handleInputEvent(blink::WebCoalescedInputEvent(key_down));
|
| -
|
| - // 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));
|
| - if (auto* controller = GetInputMethodController()) {
|
| - controller->setComposition(
|
| - newText, blink::WebVector<blink::WebCompositionUnderline>(underlines),
|
| - blink::WebRange(), 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::GetInputMethodController() {
|
| - if (!view()->mainFrame())
|
| - return nullptr;
|
| -
|
| - 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
|
|
|