Add back input method auto tests and test virtual keyboard for Quick

This patch also fixes the update of the ItemAcceptsInputMethod flag of QQuickWebEngineView
regarding to the focused element in the view.

Change-Id: Ic6e39401bdc7ca5fab9cc03e878aa731f23fc147
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

6 files changed, 77 insertions, 8 deletions

diff --git a/src/webengine/api/qquickwebenginetestsupport.cpp b/src/webengine/api/qquickwebenginetestsupport.cpp
index a946cc0e4..41f374766 100644
--- a/src/webengine/api/qquickwebenginetestsupport.cpp
+++ b/src/webengine/api/qquickwebenginetestsupport.cpp
@@ -62,8 +62,48 @@ void QQuickWebEngineErrorPage::loadStarted(const QUrl &provisionalUrl)
     Q_EMIT loadingChanged(&loadRequest);
 }
 
+
+QQuickWebEngineTestInputContext::QQuickWebEngineTestInputContext()
+    : m_visible(false)
+{
+}
+
+QQuickWebEngineTestInputContext::~QQuickWebEngineTestInputContext()
+{
+    release();
+}
+
+void QQuickWebEngineTestInputContext::create()
+{
+    QInputMethodPrivate *inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
+    inputMethodPrivate->testContext = this;
+}
+
+void QQuickWebEngineTestInputContext::release()
+{
+    QInputMethodPrivate *inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
+    inputMethodPrivate->testContext = 0;
+}
+
+void QQuickWebEngineTestInputContext::showInputPanel()
+{
+    m_visible = true;
+}
+
+void QQuickWebEngineTestInputContext::hideInputPanel()
+{
+    m_visible = false;
+}
+
+bool QQuickWebEngineTestInputContext::isInputPanelVisible() const
+{
+    return m_visible;
+}
+
+
 QQuickWebEngineTestSupport::QQuickWebEngineTestSupport()
-    : m_errorPage(new QQuickWebEngineErrorPage())
+    : m_errorPage(new QQuickWebEngineErrorPage)
+    , m_testInputContext(new QQuickWebEngineTestInputContext)
 {
 }
 
@@ -72,6 +112,11 @@ QQuickWebEngineErrorPage *QQuickWebEngineTestSupport::errorPage() const
     return m_errorPage.data();
 }
 
+QQuickWebEngineTestInputContext *QQuickWebEngineTestSupport::testInputContext() const
+{
+    return m_testInputContext.data();
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qquickwebenginetestsupport_p.cpp"
diff --git a/src/webengine/api/qquickwebenginetestsupport_p.h b/src/webengine/api/qquickwebenginetestsupport_p.h
index cca8d1df4..a84d00307 100644
--- a/src/webengine/api/qquickwebenginetestsupport_p.h
+++ b/src/webengine/api/qquickwebenginetestsupport_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <private/qinputmethod_p.h>
 #include <private/qtwebengineglobal_p.h>
 
 #include <QObject>
@@ -73,13 +74,33 @@ Q_SIGNALS:
     void loadingChanged(QQuickWebEngineLoadRequest *loadRequest);
 };
 
+class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineTestInputContext : public QPlatformInputContext {
+    Q_OBJECT
+
+public:
+    QQuickWebEngineTestInputContext();
+    ~QQuickWebEngineTestInputContext();
+
+    Q_INVOKABLE void create();
+    Q_INVOKABLE void release();
+
+    virtual void showInputPanel();
+    virtual void hideInputPanel();
+    virtual bool isInputPanelVisible() const;
+
+private:
+    bool m_visible;
+};
+
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineTestSupport : public QObject {
     Q_OBJECT
     Q_PROPERTY(QQuickWebEngineErrorPage *errorPage READ errorPage CONSTANT FINAL)
+    Q_PROPERTY(QQuickWebEngineTestInputContext *testInputContext READ testInputContext CONSTANT FINAL)
 
 public:
     QQuickWebEngineTestSupport();
     QQuickWebEngineErrorPage *errorPage() const;
+    QQuickWebEngineTestInputContext *testInputContext() const;
 
 Q_SIGNALS:
     void windowCloseRejected();
@@ -87,6 +108,7 @@ Q_SIGNALS:
 
 private:
     QScopedPointer<QQuickWebEngineErrorPage> m_errorPage;
+    QScopedPointer<QQuickWebEngineTestInputContext> m_testInputContext;
 };
 
 QT_END_NAMESPACE
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 68a290df9..bf3ea955c 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -873,8 +873,7 @@ QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent)
     Q_D(QQuickWebEngineView);
     d->q_ptr = this;
     this->setActiveFocusOnTab(true);
-    this->setFlags(QQuickItem::ItemIsFocusScope | QQuickItem::ItemAcceptsInputMethod
-                   | QQuickItem::ItemAcceptsDrops);
+    this->setFlags(QQuickItem::ItemIsFocusScope | QQuickItem::ItemAcceptsDrops);
 
 #ifndef QT_NO_ACCESSIBILITY
     QQuickAccessibleAttached *accessible = QQuickAccessibleAttached::qmlAttachedProperties(this);
diff --git a/src/webengine/plugin/testsupport/plugin.cpp b/src/webengine/plugin/testsupport/plugin.cpp
index 9352e3666..c7eda2405 100644
--- a/src/webengine/plugin/testsupport/plugin.cpp
+++ b/src/webengine/plugin/testsupport/plugin.cpp
@@ -58,6 +58,8 @@ public:
         qmlRegisterType<QQuickWebEngineTestSupport>(uri, 1, 0, "WebEngineTestSupport");
         qmlRegisterUncreatableType<QQuickWebEngineErrorPage>(uri, 1, 0, "WebEngineErrorPage",
             tr("Cannot create a separate instance of WebEngineErrorPage"));
+        qmlRegisterUncreatableType<QQuickWebEngineTestInputContext>(uri, 1, 0, "TestInputContext",
+            tr("Cannot create a separate instance of WebEngineErrorPage"));
     }
 };
 
diff --git a/src/webengine/plugin/testsupport/testsupport.pro b/src/webengine/plugin/testsupport/testsupport.pro
index 1a45ad56a..2804635f8 100644
--- a/src/webengine/plugin/testsupport/testsupport.pro
+++ b/src/webengine/plugin/testsupport/testsupport.pro
@@ -4,7 +4,7 @@ TARGETPATH = QtWebEngine/testsupport
 IMPORT_VERSION = 1.0
 
 QT += webengine qml quick
-QT_PRIVATE += webengine-private
+QT_PRIVATE += webengine-private gui-private
 
 INCLUDEPATH += $$QTWEBENGINE_ROOT/src/core $$QTWEBENGINE_ROOT/src/webengine $$QTWEBENGINE_ROOT/src/webengine/api
 
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
index 749a2e0d8..86f3aaa64 100644
--- a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -228,14 +228,15 @@ void RenderWidgetHostViewQtDelegateQuick::resize(int width, int height)
 
 void RenderWidgetHostViewQtDelegateQuick::inputMethodStateChanged(bool editorVisible)
 {
-    if (qApp->inputMethod()->isVisible() == editorVisible)
-        return;
+    setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible);
+
+    if (parentItem())
+        parentItem()->setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible);
 
-    if (parentItem() && parentItem()->flags() & QQuickItem::ItemAcceptsInputMethod) {
+    if (qApp->inputMethod()->isVisible() != editorVisible) {
         qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled | Qt::ImHints);
         qApp->inputMethod()->setVisible(editorVisible);
     }
-
 }
 
 bool RenderWidgetHostViewQtDelegateQuick::event(QEvent *event)