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 +++++--- 2 files changed, 22 insertions(+), 3 deletions(-) (limited to 'src/webengine') 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; -- cgit v1.2.3