| Index: third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp b/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
|
| index 2d7d55249c36d9e96f959714635a9bb8d23ea9bc..50f42c511dc9ee70304c95efe7d27ad0baa283b9 100644
|
| --- a/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/ImeOnFocusTest.cpp
|
| @@ -25,18 +25,18 @@ namespace blink {
|
| class ImeRequestTrackingWebViewClient
|
| : public FrameTestHelpers::TestWebViewClient {
|
| public:
|
| - ImeRequestTrackingWebViewClient() : m_imeRequestCount(0) {}
|
| + ImeRequestTrackingWebViewClient() : m_virtualKeyboardRequestCount(0) {}
|
|
|
| // WebWidgetClient methods
|
| - void showImeIfNeeded() override { ++m_imeRequestCount; }
|
| + void showVirtualKeyboard() override { ++m_virtualKeyboardRequestCount; }
|
|
|
| // Local methds
|
| - void reset() { m_imeRequestCount = 0; }
|
| + void reset() { m_virtualKeyboardRequestCount = 0; }
|
|
|
| - int imeRequestCount() { return m_imeRequestCount; }
|
| + int virtualKeyboardRequestCount() { return m_virtualKeyboardRequestCount; }
|
|
|
| private:
|
| - int m_imeRequestCount;
|
| + int m_virtualKeyboardRequestCount;
|
| };
|
|
|
| class ImeOnFocusTest : public ::testing::Test {
|
| @@ -85,7 +85,7 @@ void ImeOnFocusTest::focus(const AtomicString& element) {
|
| }
|
|
|
| void ImeOnFocusTest::runImeOnFocusTest(std::string fileName,
|
| - int expectedImeRequestCount,
|
| + int expectedVirtualKeyboardRequestCount,
|
| IntPoint tapPoint,
|
| const AtomicString& focusElement,
|
| std::string frame) {
|
| @@ -100,7 +100,7 @@ void ImeOnFocusTest::runImeOnFocusTest(std::string fileName,
|
|
|
| if (!focusElement.isNull())
|
| focus(focusElement);
|
| - EXPECT_EQ(0, client.imeRequestCount());
|
| + EXPECT_EQ(0, client.virtualKeyboardRequestCount());
|
|
|
| if (tapPoint.x() >= 0 && tapPoint.y() >= 0)
|
| sendGestureTap(webView, tapPoint);
|
| @@ -114,7 +114,8 @@ void ImeOnFocusTest::runImeOnFocusTest(std::string fileName,
|
|
|
| if (!focusElement.isNull())
|
| focus(focusElement);
|
| - EXPECT_EQ(expectedImeRequestCount, client.imeRequestCount());
|
| + EXPECT_EQ(expectedVirtualKeyboardRequestCount,
|
| + client.virtualKeyboardRequestCount());
|
|
|
| m_webViewHelper.reset();
|
| }
|
|
|