Add methods for running javascript in isolated worlds

We exposed javascript worlds for user-scripts, this adds variants of
runJavaScript that can access those worlds.

Change-Id: I5a0b40b863b543cd364c902d0a84ae2c35e2a0b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

7 files changed, 51 insertions, 12 deletions

diff --git a/src/core/renderer/user_script_controller.cpp b/src/core/renderer/user_script_controller.cpp
index 729500341..4391862a7 100644
--- a/src/core/renderer/user_script_controller.cpp
+++ b/src/core/renderer/user_script_controller.cpp
@@ -92,7 +92,7 @@ void UserScriptController::RenderViewObserverHelper::runScripts(UserScriptData::
             continue;
         blink::WebScriptSource source(blink::WebString::fromUTF8(script.source), script.url);
         if (script.worldId)
-            frame->executeScriptInIsolatedWorld(script.worldId, &source, /*numSources = */1, /*contentScriptExtentsionGroup = */ 1);
+            frame->executeScriptInIsolatedWorld(script.worldId, &source, /*numSources = */1, /*contentScriptExtentsionGroup = */ 0);
         else
             frame->executeScript(source);
     }
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index ad582d7d3..fc77bdb9d 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -170,7 +170,8 @@ static QVariant fromJSValue(const base::Value *result)
 
 static void callbackOnEvaluateJS(WebContentsAdapterClient *adapterClient, quint64 requestId, const base::Value *result)
 {
-    adapterClient->didRunJavaScript(requestId, fromJSValue(result));
+    if (requestId)
+        adapterClient->didRunJavaScript(requestId, fromJSValue(result));
 }
 
 static content::WebContents *createBlankWebContents(WebContentsAdapterClient *adapterClient, content::BrowserContext *browserContext)
@@ -719,21 +720,30 @@ QAccessibleInterface *WebContentsAdapter::browserAccessible()
 }
 #endif // QT_NO_ACCESSIBILITY
 
-void WebContentsAdapter::runJavaScript(const QString &javaScript)
+void WebContentsAdapter::runJavaScript(const QString &javaScript, quint32 worldId)
 {
     Q_D(WebContentsAdapter);
     content::RenderViewHost *rvh = d->webContents->GetRenderViewHost();
     Q_ASSERT(rvh);
-    rvh->GetMainFrame()->ExecuteJavaScript(toString16(javaScript));
+    if (worldId == 0) {
+        rvh->GetMainFrame()->ExecuteJavaScript(toString16(javaScript));
+        return;
+    }
+
+    content::RenderFrameHost::JavaScriptResultCallback callback = base::Bind(&callbackOnEvaluateJS, d->adapterClient, CallbackDirectory::NoCallbackId);
+    rvh->GetMainFrame()->ExecuteJavaScriptInIsolatedWorld(toString16(javaScript), callback, worldId);
 }
 
-quint64 WebContentsAdapter::runJavaScriptCallbackResult(const QString &javaScript)
+quint64 WebContentsAdapter::runJavaScriptCallbackResult(const QString &javaScript, quint32 worldId)
 {
     Q_D(WebContentsAdapter);
     content::RenderViewHost *rvh = d->webContents->GetRenderViewHost();
     Q_ASSERT(rvh);
     content::RenderFrameHost::JavaScriptResultCallback callback = base::Bind(&callbackOnEvaluateJS, d->adapterClient, d->nextRequestId);
-    rvh->GetMainFrame()->ExecuteJavaScript(toString16(javaScript), callback);
+    if (worldId == 0)
+        rvh->GetMainFrame()->ExecuteJavaScript(toString16(javaScript), callback);
+    else
+        rvh->GetMainFrame()->ExecuteJavaScriptInIsolatedWorld(toString16(javaScript), callback, worldId);
     return d->nextRequestId++;
 }
 
diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index d38979177..90e035da1 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -108,8 +108,8 @@ public:
     void serializeNavigationHistory(QDataStream &output);
     void setZoomFactor(qreal);
     qreal currentZoomFactor() const;
-    void runJavaScript(const QString &javaScript);
-    quint64 runJavaScriptCallbackResult(const QString &javaScript);
+    void runJavaScript(const QString &javaScript, quint32 worldId);
+    quint64 runJavaScriptCallbackResult(const QString &javaScript, quint32 worldId);
     quint64 fetchDocumentMarkup();
     quint64 fetchDocumentInnerText();
     quint64 findText(const QString &subString, bool caseSensitively, bool findBackward);
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index df1f46852..4cff0fc8c 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -1054,10 +1054,22 @@ void QQuickWebEngineView::runJavaScript(const QString &script, const QJSValue &c
     if (!d->adapter)
         return;
     if (!callback.isUndefined()) {
-        quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script);
+        quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script, QQuickWebEngineScript::MainWorld);
         d->m_callbacks.insert(requestId, callback);
     } else
-        d->adapter->runJavaScript(script);
+        d->adapter->runJavaScript(script, QQuickWebEngineScript::MainWorld);
+}
+
+void QQuickWebEngineView::runJavaScript(const QString &script, quint32 worldId, const QJSValue &callback)
+{
+    Q_D(QQuickWebEngineView);
+    if (!d->adapter)
+        return;
+    if (!callback.isUndefined()) {
+        quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script, worldId);
+        d->m_callbacks.insert(requestId, callback);
+    } else
+        d->adapter->runJavaScript(script, worldId);
 }
 
 QQuickWebEngineViewExperimental *QQuickWebEngineView::experimental() const
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index c533d0fca..093b82c60 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -284,6 +284,7 @@ public:
 
 public Q_SLOTS:
     void runJavaScript(const QString&, const QJSValue & = QJSValue());
+    Q_REVISION(3) void runJavaScript(const QString&, quint32 worldId, const QJSValue & = QJSValue());
     void loadHtml(const QString &html, const QUrl &baseUrl = QUrl());
     void goBack();
     void goForward();
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index d69437641..60372dd40 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1314,13 +1314,26 @@ void QWebEnginePage::setZoomFactor(qreal factor)
 void QWebEnginePage::runJavaScript(const QString &scriptSource)
 {
     Q_D(QWebEnginePage);
-    d->adapter->runJavaScript(scriptSource);
+    d->adapter->runJavaScript(scriptSource, QWebEngineScript::MainWorld);
 }
 
 void QWebEnginePage::runJavaScript(const QString& scriptSource, const QWebEngineCallback<const QVariant &> &resultCallback)
 {
     Q_D(QWebEnginePage);
-    quint64 requestId = d->adapter->runJavaScriptCallbackResult(scriptSource);
+    quint64 requestId = d->adapter->runJavaScriptCallbackResult(scriptSource, QWebEngineScript::MainWorld);
+    d->m_callbacks.registerCallback(requestId, resultCallback);
+}
+
+void QWebEnginePage::runJavaScript(const QString &scriptSource, quint32 worldId)
+{
+    Q_D(QWebEnginePage);
+    d->adapter->runJavaScript(scriptSource, worldId);
+}
+
+void QWebEnginePage::runJavaScript(const QString& scriptSource, quint32 worldId, const QWebEngineCallback<const QVariant &> &resultCallback)
+{
+    Q_D(QWebEnginePage);
+    quint64 requestId = d->adapter->runJavaScriptCallbackResult(scriptSource, worldId);
     d->m_callbacks.registerCallback(requestId, resultCallback);
 }
 
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 7c9495199..950ae374a 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -235,10 +235,13 @@ public:
     QSizeF contentsSize() const;
 
     void runJavaScript(const QString& scriptSource);
+    void runJavaScript(const QString& scriptSource, quint32 worldId);
 #ifdef Q_QDOC
     void runJavaScript(const QString& scriptSource, FunctorOrLambda resultCallback);
+    void runJavaScript(const QString& scriptSource, quint32 worldId, FunctorOrLambda resultCallback);
 #else
     void runJavaScript(const QString& scriptSource, const QWebEngineCallback<const QVariant &> &resultCallback);
+    void runJavaScript(const QString& scriptSource, quint32 worldId, const QWebEngineCallback<const QVariant &> &resultCallback);
 #endif
     QWebEngineScriptCollection &scripts();
     QWebEngineSettings *settings() const;