2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
|
|
|
Date: Thu, 20 Sep 2018 17:45:11 -0700
|
|
|
|
|
Subject: blink_world_context.patch
|
|
|
|
|
|
2019-12-13 17:18:45 +00:00
|
|
|
This exposes a method for obtaining a reference to an isolated world, which is
|
|
|
|
|
otherwise not available in the Blink API.
|
2018-09-21 00:30:26 +00:00
|
|
|
|
2018-09-14 18:03:43 +00:00
|
|
|
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
|
2020-09-21 08:00:36 +00:00
|
|
|
index 229b6d79668c47417e56d5869182183cdb209429..1cc8f91d233a6df89b1200e80b77585de681a8c7 100644
|
2018-09-14 18:03:43 +00:00
|
|
|
--- a/third_party/blink/public/web/web_local_frame.h
|
|
|
|
|
+++ b/third_party/blink/public/web/web_local_frame.h
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -358,6 +358,8 @@ class WebLocalFrame : public WebFrame {
|
2020-06-01 20:34:34 +00:00
|
|
|
// Returns the world ID associated with |script_context|.
|
|
|
|
|
virtual int32_t GetScriptContextWorldId(
|
|
|
|
|
v8::Local<v8::Context> script_context) const = 0;
|
2018-09-14 18:03:43 +00:00
|
|
|
+ virtual v8::Local<v8::Context> WorldScriptContext(
|
|
|
|
|
+ v8::Isolate* isolate, int world_id) const = 0;
|
2020-06-01 20:34:34 +00:00
|
|
|
|
2018-09-14 18:03:43 +00:00
|
|
|
// Executes script in the context of the current page and returns the value
|
|
|
|
|
// that the script evaluated to with callback. Script execution can be
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
|
2020-09-21 08:00:36 +00:00
|
|
|
index 53b4f68d0785fa6ec5b7256c791b56b26a2ee2bd..14c5e5edfe52279319938d203a8311195c8ef77f 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
|
|
|
|
|
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -980,6 +980,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
|
2018-09-14 05:02:16 +00:00
|
|
|
return MainWorldScriptContext()->Global();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+v8::Local<v8::Context> WebLocalFrameImpl::WorldScriptContext(
|
|
|
|
|
+ v8::Isolate* isolate, int world_id) const {
|
|
|
|
|
+ scoped_refptr<DOMWrapperWorld> world = DOMWrapperWorld::EnsureIsolatedWorld(
|
|
|
|
|
+ isolate, world_id);
|
|
|
|
|
+ return ToScriptState(GetFrame(), *world)->GetContext();
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
bool WebFrame::ScriptCanAccess(WebFrame* target) {
|
|
|
|
|
return BindingSecurity::ShouldAllowAccessToFrame(
|
|
|
|
|
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
|
|
|
|
|
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
|
2020-09-21 08:00:36 +00:00
|
|
|
index 46e977ab9fedbfd58d425fe4bf3b85762517fae4..85e66b66472bf83140d6652eaead2326b4c7c3dc 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
|
|
|
|
|
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
|
2020-09-21 08:00:36 +00:00
|
|
|
@@ -163,6 +163,8 @@ class CORE_EXPORT WebLocalFrameImpl final
|
2018-09-14 05:02:16 +00:00
|
|
|
v8::Local<v8::Context> MainWorldScriptContext() const override;
|
2020-06-01 20:34:34 +00:00
|
|
|
int32_t GetScriptContextWorldId(
|
|
|
|
|
v8::Local<v8::Context> script_context) const override;
|
2018-09-14 05:02:16 +00:00
|
|
|
+ v8::Local<v8::Context> WorldScriptContext(
|
|
|
|
|
+ v8::Isolate* isolate, int world_id) const override;
|
2019-10-28 22:12:35 +00:00
|
|
|
void RequestExecuteScriptAndReturnValue(const WebScriptSource&,
|
|
|
|
|
bool user_gesture,
|
|
|
|
|
WebScriptExecutionCallback*) override;
|
