diff options
| author | Moss Heim <moss.heim@qt.io> | 2024-03-26 11:01:34 +0100 |
|---|---|---|
| committer | Moss Heim <moss.heim@qt.io> | 2024-05-22 10:46:26 +0200 |
| commit | 8a610f99b9f6eaf48438e41660e6b4b35e02f2bb (patch) | |
| tree | 44ec26fcc20d6430e98763127a8b23c8309eb28a /src/webenginequick/api/qquickwebengineview.cpp | |
| parent | 2e6f7bb1ec5cf6dbbdd27b416660bfa4f385fe85 (diff) | |
Add QWebEngineFrame::runJavaScript
Run JavaScript code on a specific frame, optionally executing a callback
when done. Uses the enclosing page's callback system.
There are two sets of overloads, matching the API of QQuickWebEngineView
and QWebEnginePage.
Also adds QQuickWebEngineFrame::runJavaScript()
Change-Id: I48746bd83d0f19644157548483a94637fc70c20f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webenginequick/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webenginequick/api/qquickwebengineview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp index 5a68cf687..7c77f22de 100644 --- a/src/webenginequick/api/qquickwebengineview.cpp +++ b/src/webenginequick/api/qquickwebengineview.cpp @@ -1302,11 +1302,11 @@ bool QQuickWebEngineView::activeFocusOnPress() const } void QQuickWebEngineViewPrivate::runJavaScript( - const QString &script, quint32 worldId, + const QString &script, quint32 worldId, quint64 frameId, const std::function<void(const QVariant &)> &callback) { ensureContentsAdapter(); - adapter->runJavaScript(script, worldId, callback); + adapter->runJavaScript(script, worldId, frameId, callback); } void QQuickWebEngineViewPrivate::didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result) @@ -1499,7 +1499,7 @@ void QQuickWebEngineView::runJavaScript(const QString &script, quint32 worldId, callback.call(args); }; } - d->runJavaScript(script, worldId, wrappedCallback); + d->runJavaScript(script, worldId, WebContentsAdapter::kUseMainFrameId, wrappedCallback); } qreal QQuickWebEngineView::zoomFactor() const |