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>

3 files changed, 18 insertions, 8 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);