2 files changed, 18 insertions, 19 deletions
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index 11ed33b5e..85c5e1a73 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -1296,19 +1296,18 @@ bool QQuickWebEngineView::activeFocusOnPress() const
     return d->m_activeFocusOnPress;
 }
 
-void QQuickWebEngineViewPrivate::didRunJavaScript(quint64 requestId, const QVariant &result)
+void QQuickWebEngineViewPrivate::runJavaScript(
+        const QString &script, quint32 worldId,
+        const std::function<void(const QVariant &)> &callback)
 {
-    Q_Q(QQuickWebEngineView);
-    QJSValue callback = m_callbacks.take(requestId);
-    QJSValueList args;
-    args.append(qmlEngine(q)->toScriptValue(result));
-    callback.call(args);
+    ensureContentsAdapter();
+    adapter->runJavaScript(script, worldId, callback);
 }
 
 void QQuickWebEngineViewPrivate::didPrintPage(quint64 requestId, QSharedPointer<QByteArray> result)
 {
     Q_Q(QQuickWebEngineView);
-    QJSValue callback = m_callbacks.take(requestId);
+    QJSValue callback = m_printCallbacks.take(requestId);
     QJSValueList args;
     args.append(qmlEngine(q)->toScriptValue(*(result.data())));
     callback.call(args);
@@ -1487,16 +1486,15 @@ void QQuickWebEngineView::runJavaScript(const QString &script, const QJSValue &c
 void QQuickWebEngineView::runJavaScript(const QString &script, quint32 worldId, const QJSValue &callback)
 {
     Q_D(QQuickWebEngineView);
-    d->ensureContentsAdapter();
+    std::function<void(const QVariant &)> wrappedCallback;
     if (!callback.isUndefined()) {
-        quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script, worldId);
-        if (requestId) {
-            d->m_callbacks.insert(requestId, callback);
-        } else {
-            callback.call();
-        }
-    } else
-        d->adapter->runJavaScript(script, worldId);
+        wrappedCallback = [this, callback](const QVariant &result) {
+            QJSValueList args;
+            args.append(qmlEngine(this)->toScriptValue(result));
+            callback.call(args);
+        };
+    }
+    d->runJavaScript(script, worldId, wrappedCallback);
 }
 
 qreal QQuickWebEngineView::zoomFactor() const
@@ -1593,7 +1591,7 @@ void QQuickWebEngineView::printToPdf(const QJSValue &callback, PrintedPageSizeId
 
     d->ensureContentsAdapter();
     quint64 requestId = d->adapter->printToPDFCallbackResult(pageLayout, ranges);
-    d->m_callbacks.insert(requestId, callback);
+    d->m_printCallbacks.insert(requestId, callback);
 #else
     Q_UNUSED(pageSizeId);
     Q_UNUSED(orientation);
diff --git a/src/webenginequick/api/qquickwebengineview_p_p.h b/src/webenginequick/api/qquickwebengineview_p_p.h
index cf4da7c40..eed8342eb 100644
--- a/src/webenginequick/api/qquickwebengineview_p_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p_p.h
@@ -92,7 +92,8 @@ public:
     void runFileChooser(QSharedPointer<QtWebEngineCore::FilePickerController>) override;
     void desktopMediaRequested(QtWebEngineCore::DesktopMediaController *) override;
     void showColorDialog(QSharedPointer<QtWebEngineCore::ColorChooserController>) override;
-    void didRunJavaScript(quint64, const QVariant&) override;
+    void runJavaScript(const QString &script, quint32 worldId,
+                       const std::function<void(const QVariant &)> &callback) override;
     void didFetchDocumentMarkup(quint64, const QString&) override { }
     void didFetchDocumentInnerText(quint64, const QString&) override { }
     void didPrintPage(quint64 requestId, QSharedPointer<QByteArray>) override;
@@ -157,7 +158,7 @@ public:
     bool m_fullscreenMode;
     bool isLoading;
     bool m_activeFocusOnPress;
-    QMap<quint64, QJSValue> m_callbacks;
+    QMap<quint64, QJSValue> m_printCallbacks;
     QQmlWebChannel *m_webChannel;
     QPointer<QQuickWebEngineView> inspectedView;
     QPointer<QQuickWebEngineView> devToolsView;