Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/3rdparty
	tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp

Change-Id: I070173576fc4be53689ce0dd9e1fd4133f5814da

4 files changed, 170 insertions, 121 deletions

diff --git a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
index fef92c311..e0765736e 100644
--- a/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
+++ b/tests/auto/widgets/qwebenginepage/qwebenginepage.pro
@@ -1,4 +1,4 @@
 include(../tests.pri)
-QT *= core-private gui-private
+QT *= core-private
 
 contains(WEBENGINE_CONFIG, use_pdf): DEFINES+=QWEBENGINEPAGE_PDFPRINTINGENABLED
diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
index 5467ce39e..71c949fff 100644
--- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
+++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
@@ -32,17 +32,15 @@
 #include <QOpenGLWidget>
 #include <QPaintEngine>
 #include <QPushButton>
+#include <QScreen>
 #include <QStateMachine>
-#include <QStyle>
 #include <QtGui/QClipboard>
 #include <QtTest/QtTest>
 #include <QTextCharFormat>
 #include <QWebChannel>
-#include <private/qinputmethod_p.h>
 #include <qnetworkcookiejar.h>
 #include <qnetworkreply.h>
 #include <qnetworkrequest.h>
-#include <qpa/qplatforminputcontext.h>
 #include <qwebenginedownloaditem.h>
 #include <qwebenginefullscreenrequest.h>
 #include <qwebenginehistory.h>
@@ -66,38 +64,6 @@ static void removeRecursive(const QString& dirname)
     QDir().rmdir(dirname);
 }
 
-class TestInputContext : public QPlatformInputContext
-{
-public:
-    TestInputContext()
-    : m_visible(false)
-    {
-        QInputMethodPrivate* inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
-        inputMethodPrivate->testContext = this;
-    }
-
-    ~TestInputContext()
-    {
-        QInputMethodPrivate* inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
-        inputMethodPrivate->testContext = 0;
-    }
-
-    virtual void showInputPanel()
-    {
-        m_visible = true;
-    }
-    virtual void hideInputPanel()
-    {
-        m_visible = false;
-    }
-    virtual bool isInputPanelVisible() const
-    {
-        return m_visible;
-    }
-
-    bool m_visible;
-};
-
 class tst_QWebEnginePage : public QObject
 {
     Q_OBJECT
@@ -1671,24 +1637,6 @@ void tst_QWebEnginePage::inputMethods_data()
 }
 
 #if defined(QWEBENGINEPAGE_INPUTMETHODQUERY)
-static Qt::InputMethodHints inputMethodHints(QObject* object)
-{
-    if (QGraphicsObject* o = qobject_cast<QGraphicsObject*>(object))
-        return o->inputMethodHints();
-    if (QWidget* w = qobject_cast<QWidget*>(object))
-        return w->inputMethodHints();
-    return Qt::InputMethodHints();
-}
-
-static bool inputMethodEnabled(QObject* object)
-{
-    if (QGraphicsObject* o = qobject_cast<QGraphicsObject*>(object))
-        return o->flags() & QGraphicsItem::ItemAcceptsInputMethod;
-    if (QWidget* w = qobject_cast<QWidget*>(object))
-        return w->testAttribute(Qt::WA_InputMethodEnabled);
-    return false;
-}
-
 static void clickOnPage(QWebEnginePage* page, const QPoint& position)
 {
     QMouseEvent evpres(QEvent::MouseButtonPress, position, Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
@@ -1741,32 +1689,6 @@ void tst_QWebEnginePage::inputMethods()
 
     clickOnPage(page, textInputCenter);
 
-    // This part of the test checks if the SIP (Software Input Panel) is triggered,
-    // which normally happens on mobile platforms, when a user input form receives
-    // a mouse click.
-    int  inputPanel = 0;
-    if (viewType == "QWebEngineView") {
-        if (QWebEngineView* wv = qobject_cast<QWebEngineView*>(view))
-            inputPanel = wv->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel);
-    } else if (viewType == "QGraphicsWebView") {
-        if (QGraphicsWebView* wv = qobject_cast<QGraphicsWebView*>(view))
-            inputPanel = wv->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel);
-    }
-
-    // For non-mobile platforms RequestSoftwareInputPanel event is not called
-    // because there is no SIP (Software Input Panel) triggered. In the case of a
-    // mobile platform, an input panel, e.g. virtual keyboard, is usually invoked
-    // and the RequestSoftwareInputPanel event is called. For these two situations
-    // this part of the test can verified as the checks below.
-    if (inputPanel)
-        QVERIFY(testContext.isInputPanelVisible());
-    else
-        QVERIFY(!testContext.isInputPanelVisible());
-    testContext.hideInputPanel();
-
-    clickOnPage(page, textInputCenter);
-    QVERIFY(testContext.isInputPanelVisible());
-
     //ImMicroFocus
     QVariant variant = page->inputMethodQuery(Qt::ImMicroFocus);
     QVERIFY(inputs.at(0).geometry().contains(variant.toRect().topLeft()));
@@ -1960,38 +1882,6 @@ void tst_QWebEnginePage::inputMethods()
 
     //END - Tests for Selection when the Editor is not in Composition mode
 
-    //ImhHiddenText
-    QPoint passwordInputCenter = inputs.at(1).geometry().center();
-    clickOnPage(page, passwordInputCenter);
-
-    QVERIFY(inputMethodEnabled(view));
-    QVERIFY(inputMethodHints(view) & Qt::ImhHiddenText);
-
-    clickOnPage(page, textInputCenter);
-    QVERIFY(!(inputMethodHints(view) & Qt::ImhHiddenText));
-
-    page->setHtml("<html><body><p>nothing to input here");
-    testContext.hideInputPanel();
-
-    QWebEngineElement para = page->mainFrame()->findFirstElement("p");
-    clickOnPage(page, para.geometry().center());
-
-    QVERIFY(!testContext.isInputPanelVisible());
-
-    //START - Test for sending empty QInputMethodEvent
-    page->setHtml("<html><body>" \
-                                            "<input type='text' id='input3' value='QtWebEngine2'/>" \
-                                            "</body></html>");
-    evaluateJavaScriptSync(page, "var inputEle = document.getElementById('input3'); inputEle.focus(); inputEle.select();");
-
-    //Send empty QInputMethodEvent
-    QInputMethodEvent emptyEvent;
-    page->event(&emptyEvent);
-
-    QString inputValue = evaluateJavaScriptSync(page, "document.getElementById('input3').value").toString();
-    QCOMPARE(inputValue, QString("QtWebEngine2"));
-    //END - Test for sending empty QInputMethodEvent
-
     page->setHtml("<html><body>" \
                                             "<input type='text' id='input4' value='QtWebEngine inputMethod'/>" \
                                             "</body></html>");
@@ -2300,15 +2190,6 @@ void tst_QWebEnginePage::inputMethods()
     anchorPosition =  variant.toInt();
     QCOMPARE(anchorPosition, 12);
 
-    // Check sending RequestSoftwareInputPanel event
-    page->setHtml("<html><body>" \
-                                            "<input type='text' id='input5' value='QtWebEngine inputMethod'/>" \
-                                            "<div id='btnDiv' onclick='i=document.getElementById(&quot;input5&quot;); i.focus();'>abc</div>"\
-                                            "</body></html>");
-    QWebEngineElement inputElement = page->mainFrame()->findFirstElement("div");
-    clickOnPage(page, inputElement.geometry().center());
-
-    QVERIFY(!testContext.isInputPanelVisible());
 
     // START - Newline test for textarea
     qApp->processEvents();
diff --git a/tests/auto/widgets/qwebengineview/qwebengineview.pro b/tests/auto/widgets/qwebengineview/qwebengineview.pro
index e99c7f493..d91c0074b 100644
--- a/tests/auto/widgets/qwebengineview/qwebengineview.pro
+++ b/tests/auto/widgets/qwebengineview/qwebengineview.pro
@@ -1 +1,2 @@
 include(../tests.pri)
+QT *= gui-private
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 53c7650fb..a9286c92d 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -22,8 +22,10 @@
 #include <qtest.h>
 #include "../util.h"
 
+#include <private/qinputmethod_p.h>
 #include <qpainter.h>
 #include <qpagelayout.h>
+#include <qpa/qplatforminputcontext.h>
 #include <qwebengineview.h>
 #include <qwebenginepage.h>
 #include <qwebenginesettings.h>
@@ -39,6 +41,7 @@
 #include <QtWebEngineCore/qwebenginehttprequest.h>
 #include <QTcpServer>
 #include <QTcpSocket>
+#include <QStyle>
 
 #define VERIFY_INPUTMETHOD_HINTS(actual, expect) \
     QVERIFY(actual == expect);
@@ -91,6 +94,10 @@ private Q_SLOTS:
     void keyboardEvents();
     void keyboardFocusAfterPopup();
     void postData();
+
+    void softwareInputPanel();
+    void hiddenText();
+    void emptyInputMethodEvent();
 };
 
 // This will be called before the first test function is executed.
@@ -1216,5 +1223,165 @@ void tst_QWebEngineView::postData()
     server.close();
 }
 
+class TestInputContext : public QPlatformInputContext
+{
+public:
+    TestInputContext()
+    : m_visible(false)
+    {
+        QInputMethodPrivate* inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
+        inputMethodPrivate->testContext = this;
+    }
+
+    ~TestInputContext()
+    {
+        QInputMethodPrivate* inputMethodPrivate = QInputMethodPrivate::get(qApp->inputMethod());
+        inputMethodPrivate->testContext = 0;
+    }
+
+    virtual void showInputPanel()
+    {
+        m_visible = true;
+    }
+    virtual void hideInputPanel()
+    {
+        m_visible = false;
+    }
+    virtual bool isInputPanelVisible() const
+    {
+        return m_visible;
+    }
+
+    bool m_visible;
+};
+
+static QPoint elementCenter(QWebEnginePage *page, const QString &id)
+{
+    const QString jsCode(
+            "(function(){"
+            "   var elem = document.getElementById('" + id + "');"
+            "   var rect = elem.getBoundingClientRect();"
+            "   return [(rect.left + rect.right) / 2, (rect.top + rect.bottom) / 2];"
+            "})()");
+    QVariantList rectList = evaluateJavaScriptSync(page, jsCode).toList();
+
+    if (rectList.count() != 2) {
+        qWarning("elementCenter failed.");
+        return QPoint();
+    }
+
+    return QPoint(rectList.at(0).toInt(), rectList.at(1).toInt());
+}
+
+void tst_QWebEngineView::softwareInputPanel()
+{
+    TestInputContext testContext;
+    QWebEngineView view;
+    view.show();
+
+    QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
+    view.setHtml("<html><body>"
+                 "  <input type='text' id='input1' value='' size='50'/>"
+                 "</body></html>");
+    QVERIFY(loadFinishedSpy.wait());
+
+    QPoint textInputCenter = elementCenter(view.page(), "input1");
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, textInputCenter);
+    QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("input1"));
+
+    // This part of the test checks if the SIP (Software Input Panel) is triggered,
+    // which normally happens on mobile platforms, when a user input form receives
+    // a mouse click.
+    int inputPanel = view.style()->styleHint(QStyle::SH_RequestSoftwareInputPanel);
+
+    // For non-mobile platforms RequestSoftwareInputPanel event is not called
+    // because there is no SIP (Software Input Panel) triggered. In the case of a
+    // mobile platform, an input panel, e.g. virtual keyboard, is usually invoked
+    // and the RequestSoftwareInputPanel event is called. For these two situations
+    // this part of the test can verified as the checks below.
+    if (inputPanel)
+        QTRY_VERIFY(testContext.isInputPanelVisible());
+    else
+        QTRY_VERIFY(!testContext.isInputPanelVisible());
+    testContext.hideInputPanel();
+
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, textInputCenter);
+    QTRY_VERIFY(testContext.isInputPanelVisible());
+
+    view.setHtml("<html><body><p id='para'>nothing to input here</p></body></html>");
+    QVERIFY(loadFinishedSpy.wait());
+    testContext.hideInputPanel();
+
+    QPoint paraCenter = elementCenter(view.page(), "para");
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, paraCenter);
+
+    QVERIFY(!testContext.isInputPanelVisible());
+
+    // Check sending RequestSoftwareInputPanel event
+    view.page()->setHtml("<html><body>"
+                         "  <input type='text' id='input1' value='QtWebEngine inputMethod'/>"
+                         "  <div id='btnDiv' onclick='i=document.getElementById(&quot;input1&quot;); i.focus();'>abc</div>"
+                         "</body></html>");
+    QVERIFY(loadFinishedSpy.wait());
+
+    QPoint btnDivCenter = elementCenter(view.page(), "btnDiv");
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, btnDivCenter);
+
+    QVERIFY(!testContext.isInputPanelVisible());
+}
+
+void tst_QWebEngineView::hiddenText()
+{
+    QWebEngineView view;
+    view.show();
+
+    QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
+    view.setHtml("<html><body>"
+                 "  <input type='text' id='input1' value='QtWebEngine' size='50'/><br>"
+                 "  <input type='password' id='password1'/>"
+                 "</body></html>");
+    QVERIFY(loadFinishedSpy.wait());
+
+    QPoint passwordInputCenter = elementCenter(view.page(), "password1");
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, passwordInputCenter);
+    QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("password1"));
+
+    QVERIFY(view.focusProxy()->testAttribute(Qt::WA_InputMethodEnabled));
+    QVERIFY(view.focusProxy()->inputMethodHints() & Qt::ImhHiddenText);
+
+    QPoint textInputCenter = elementCenter(view.page(), "input1");
+    QTest::mouseClick(view.focusProxy(), Qt::LeftButton, 0, textInputCenter);
+    QTRY_COMPARE(evaluateJavaScriptSync(view.page(), "document.activeElement.id").toString(), QStringLiteral("input1"));
+    QVERIFY(!(view.focusProxy()->inputMethodHints() & Qt::ImhHiddenText));
+}
+
+void tst_QWebEngineView::emptyInputMethodEvent()
+{
+    QWebEngineView view;
+    view.show();
+
+    QSignalSpy selectionChangedSpy(&view, SIGNAL(selectionChanged()));
+    QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
+    view.setHtml("<html><body>"
+                 "  <input type='text' id='input1' value='QtWebEngine'/>"
+                 "</body></html>");
+    QVERIFY(loadFinishedSpy.wait());
+
+    evaluateJavaScriptSync(view.page(), "var inputEle = document.getElementById('input1'); inputEle.focus(); inputEle.select();");
+    QTRY_VERIFY(!evaluateJavaScriptSync(view.page(), "window.getSelection().toString()").toString().isEmpty());
+
+    QEXPECT_FAIL("", "https://bugreports.qt.io/browse/QTBUG-53134", Continue);
+    QVERIFY(selectionChangedSpy.wait(100));
+    QEXPECT_FAIL("", "https://bugreports.qt.io/browse/QTBUG-53134", Continue);
+    QCOMPARE(selectionChangedSpy.count(), 1);
+
+    // Send empty QInputMethodEvent
+    QInputMethodEvent emptyEvent;
+    QApplication::sendEvent(view.focusProxy(), &emptyEvent);
+
+    QString inputValue = evaluateJavaScriptSync(view.page(), "document.getElementById('input1').value").toString();
+    QCOMPARE(inputValue, QString("QtWebEngine"));
+}
+
 QTEST_MAIN(tst_QWebEngineView)
 #include "tst_qwebengineview.moc"