From 548c7eb37456c13fa16ca286016434cdcbdcf96a Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Tue, 21 Jan 2014 15:42:56 +0100 Subject: QtQuick: add runJavaScript. Much like the widgets version. This should be helpful to start testing QWebChannel integration. Includes a very basic autotest that checks both approaches (with or without callback) through the view's title property. Change-Id: Id9c3e3736f36d53cecf1dd52e8811c4b921dcf08 Reviewed-by: Jocelyn Turcotte --- src/webengine/api/qquickwebengineview.cpp | 17 +++++ src/webengine/api/qquickwebengineview_p_p.h | 8 ++- .../auto/quick/qmltests/data/TestWebEngineView.qml | 3 + .../auto/quick/qmltests/data/tst_runJavaScript.qml | 79 ++++++++++++++++++++++ tests/auto/quick/qmltests/qmltests.pro | 3 +- 5 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 tests/auto/quick/qmltests/data/tst_runJavaScript.qml diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 6c42a3b7a..0c6ef7ce7 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -421,6 +421,14 @@ void QQuickWebEngineView::stop() d->adapter->stop(); } +void QQuickWebEngineViewPrivate::didRunJavaScript(quint64 requestId, const QVariant &result) +{ + QJSValue callback = m_callbacks.take(requestId); + QJSValueList args; + args.append(callback.engine()->toScriptValue(result)); + callback.call(args); +} + bool QQuickWebEngineView::isLoading() const { Q_D(const QQuickWebEngineView); @@ -488,6 +496,15 @@ QQmlComponent *QQuickWebEngineViewExperimental::extraContextMenuEntriesComponent return d_ptr->contextMenuExtraItems; } +void QQuickWebEngineViewExperimental::runJavaScript(const QString &script, const QJSValue &callback) +{ + if (!callback.isUndefined()) { + quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script, /*xPath=*/QString()); + d_ptr->m_callbacks.insert(requestId, callback); + } else + d_ptr->adapter->runJavaScript(script, /*xPath=*/QString()); +} + void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { QQuickItem::geometryChanged(newGeometry, oldGeometry); diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index ce8b64001..5c75f7780 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -87,12 +87,13 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObjec public: void setIsFullScreen(bool fullscreen); bool isFullScreen() const; - -public Q_SLOTS: QQuickWebEngineViewport *viewport() const; void setExtraContextMenuEntriesComponent(QQmlComponent *); QQmlComponent *extraContextMenuEntriesComponent() const; +public Q_SLOTS: + void runJavaScript(const QString&, const QJSValue & = QJSValue()); + Q_SIGNALS: void newViewRequested(QQuickWebEngineNewViewRequest *request); void fullScreenRequested(bool fullScreen); @@ -138,7 +139,7 @@ public: virtual bool contextMenuRequested(const WebEngineContextMenuData &) Q_DECL_OVERRIDE; virtual void javascriptDialog(QSharedPointer) Q_DECL_OVERRIDE; virtual void runFileChooser(FileChooserMode, const QString &defaultFileName, const QStringList &acceptedMimeTypes) Q_DECL_OVERRIDE; - virtual void didRunJavaScript(quint64, const QVariant&) Q_DECL_OVERRIDE { } + virtual void didRunJavaScript(quint64, const QVariant&) Q_DECL_OVERRIDE; virtual void didFetchDocumentMarkup(quint64, const QString&) Q_DECL_OVERRIDE { } virtual void didFetchDocumentInnerText(quint64, const QString&) Q_DECL_OVERRIDE { } virtual void didFindText(quint64, int) Q_DECL_OVERRIDE { } @@ -158,6 +159,7 @@ public: bool m_isLoading; bool m_isFullScreen; qreal devicePixelRatio; + QMap m_callbacks; private: QScopedPointer m_uIDelegatesManager; diff --git a/tests/auto/quick/qmltests/data/TestWebEngineView.qml b/tests/auto/quick/qmltests/data/TestWebEngineView.qml index 910ecbd7d..44a7f4f83 100644 --- a/tests/auto/quick/qmltests/data/TestWebEngineView.qml +++ b/tests/auto/quick/qmltests/data/TestWebEngineView.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtWebEngine 1.0 +import QtWebEngine.experimental 1.0 WebEngineView { property var loadStatus: null @@ -78,6 +79,8 @@ WebEngineView { return predicate() } + function runJavaScript(script, callback) { experimental.runJavaScript(script, callback); } + TestResult { id: testResult } onLoadingStateChanged: { diff --git a/tests/auto/quick/qmltests/data/tst_runJavaScript.qml b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml new file mode 100644 index 000000000..42c6928e5 --- /dev/null +++ b/tests/auto/quick/qmltests/data/tst_runJavaScript.qml @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtWebEngine 1.0 + +TestWebEngineView { + id: webEngineView + width: 400 + height: 300 + + SignalSpy { + id: spy + target: webEngineView + signalName: "titleChanged" + } + + TestCase { + name: "WebEngineViewRunJavaScript" + function test_runJavaScript() { + var testTitle = "Title to test runJavaScript"; + runJavaScript("document.title = \"" + testTitle +"\""); + _waitFor(function() { spy.count > 0; }); + compare(spy.count, 1); + compare(webEngineView.title, testTitle); + + var testTitle2 = "Foobar" + var testHtml = "" + testTitle2 + ""; + loadHtml(testHtml); + waitForLoadSucceeded(); + var callbackCalled = false; + runJavaScript("document.title", function(result) { + compare(result, testTitle2); + callbackCalled = true; + }); + wait(100); + verify(callbackCalled); + } + } +} diff --git a/tests/auto/quick/qmltests/qmltests.pro b/tests/auto/quick/qmltests/qmltests.pro index 19df60591..5883574d3 100644 --- a/tests/auto/quick/qmltests/qmltests.pro +++ b/tests/auto/quick/qmltests/qmltests.pro @@ -1,6 +1,6 @@ include(../tests.pri) -QT += webengine qmltest +QT += qmltest QT_PRIVATE += quick-private IMPORTPATH += $$PWD/data @@ -16,6 +16,7 @@ OTHER_FILES += \ $$PWD/data/tst_loadProgressSignal.qml \ $$PWD/data/tst_loadUrl.qml \ $$PWD/data/tst_properties.qml \ + $$PWD/data/tst_runJavaScript.qml \ $$PWD/data/tst_titleChanged.qml load(qt_build_paths) -- cgit v1.2.3