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

Conflicts: src/3rdparty src/core/permission_manager_qt.cpp src/core/renderer/web_channel_ipc_transport.cpp src/core/renderer/web_channel_ipc_transport.h Change-Id: I25fd8ed7c433dadce44d8ac1e39f86e211ec25f0
author: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> 2016-06-20 13:38:11 +0200
committer: Liang Qi <liang.qi@qt.io> 2016-06-20 18:27:44 +0200
commit: 25ccef35eb19fd656eba2a7abe5419972ed28552 (patch)
tree: e0c92532c3c70135d0a547675414e95d21a66822 /tests/auto/quick/qmltests/data
parent: 3398abfc1b5b789d11592aada0b5860e36a50041 (diff)
parent: e91f09947b55dda8a13b2aeb0963836dee2ece8d (diff)
4 files changed, 99 insertions, 13 deletions
diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
index 34fc5fb2f..0d2a34645 100644
--- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml
+++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml
@@ -28,7 +28,7 @@
 
 import QtQuick 2.0
 import QtTest 1.0
-import QtWebEngine 1.2
+import QtWebEngine 1.3
 
 WebEngineView {
     property var loadStatus: null
diff --git a/tests/auto/quick/qmltests/data/test4.html b/tests/auto/quick/qmltests/data/test4.html
index 8f75af606..142b53668 100644
--- a/tests/auto/quick/qmltests/data/test4.html
+++ b/tests/auto/quick/qmltests/data/test4.html
@@ -12,6 +12,17 @@
         <meta name="viewport" content="initial-scale=2.0"/>
     </head>
     <body>
+        <button onclick="scrollWin()", id="scroll">Click me to scroll!</button><br><br>
+
+        <script>
+            window.onload = function() {
+                document.getElementById("scroll").focus();
+            }
+
+            function scrollWin() {
+                window.scrollTo(0, 600);
+            }
+        </script>
         <div id="content">
             bla00<br/>
             bla01<br/>
diff --git a/tests/auto/quick/qmltests/data/tst_filePicker.qml b/tests/auto/quick/qmltests/data/tst_filePicker.qml
index 117141935..4e74af733 100644
--- a/tests/auto/quick/qmltests/data/tst_filePicker.qml
+++ b/tests/auto/quick/qmltests/data/tst_filePicker.qml
@@ -68,10 +68,8 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("test1.html"))
 
             keyPress(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            wait(100) // The ui delegate is invoked asynchronously
-            verify(FilePickerParams.filePickerOpened)
-            titleSpy.wait()
-            compare(webEngineView.title, "test1.html")
+            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(webEngineView, "title", "test1.html")
         }
 
         function test_acceptMultipleFilesSelection() {
@@ -83,10 +81,8 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("test2.html"))
 
             keyPress(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            wait(100)
-            verify(FilePickerParams.filePickerOpened)
-            titleSpy.wait()
-            compare(webEngineView.title, "test1.html,test2.html")
+            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(webEngineView, "title", "test1.html,test2.html")
         }
 
         function test_acceptDirectory() {
@@ -97,10 +93,8 @@ TestWebEngineView {
             FilePickerParams.selectedFilesUrl.push(Qt.resolvedUrl("../data"))
 
             keyPress(Qt.Key_Enter) // Focus is on the button. Open FileDialog.
-            wait(100) // The ui delegate is invoked asynchronously
-            verify(FilePickerParams.filePickerOpened)
-            titleSpy.wait()
-            compare(webEngineView.title, "data")
+            tryCompare(FilePickerParams, "filePickerOpened", true)
+            tryCompare(webEngineView, "title", "data")
         }
 
         function test_reject() {
diff --git a/tests/auto/quick/qmltests/data/tst_scrollPosition.qml b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
new file mode 100644
index 000000000..08bb0f3b4
--- /dev/null
+++ b/tests/auto/quick/qmltests/data/tst_scrollPosition.qml
@@ -0,0 +1,81 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.2
+import QtTest 1.0
+import QtWebEngine 1.3
+
+TestWebEngineView {
+    id: webEngineView
+    width: 300
+    height: 400
+
+    property var testUrl: Qt.resolvedUrl("test4.html")
+
+    SignalSpy {
+        id: scrollPositionSpy
+        target: webEngineView
+        signalName: "onScrollPositionChanged"
+    }
+
+    TestCase {
+        name: "ScrollPosition"
+        when: windowShown
+
+        function init() {
+            webEngineView.url = Qt.resolvedUrl("about:blank");
+            verify(webEngineView.waitForLoadSucceeded());
+        }
+
+        function test_scrollPosition() {
+            webEngineView.url = testUrl;
+            verify(webEngineView.waitForLoadSucceeded());
+
+            keyPress(Qt.Key_Return); // Focus is on the scroll button.
+
+            tryCompare(scrollPositionSpy, "count", 1);
+            compare(webEngineView.scrollPosition.x, 0);
+            compare(webEngineView.scrollPosition.y, 600);
+        }
+
+        function test_scrollPositionAfterReload() {
+            webEngineView.url = testUrl;
+            verify(webEngineView.waitForLoadSucceeded());
+            tryCompare(webEngineView.scrollPosition, "y", 0);
+
+            keyPress(Qt.Key_Return); // Focus is on the scroll button.
+            scrollPositionSpy.wait();
+
+            webEngineView.reload();
+            verify(webEngineView.waitForLoadSucceeded());
+
+            tryCompare(webEngineView.scrollPosition, "x", 0);
+            tryCompare(webEngineView.scrollPosition, "y", 600);
+        }
+    }
+}
author	Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>	2016-06-20 13:38:11 +0200
committer	Liang Qi <liang.qi@qt.io>	2016-06-20 18:27:44 +0200
commit	25ccef35eb19fd656eba2a7abe5419972ed28552 (patch)
tree	e0c92532c3c70135d0a547675414e95d21a66822 /tests/auto/quick/qmltests/data
parent	3398abfc1b5b789d11592aada0b5860e36a50041 (diff)
parent	e91f09947b55dda8a13b2aeb0963836dee2ece8d (diff)