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-01-17 18:41:52 +00:00
|
|
|
index 461e1574cd55860ea62a2c7f509a2fdb4134c898..0f45096b984f64fb0c094cd0996a2afbb64ddfb6 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-01-17 18:41:52 +00:00
|
|
|
@@ -347,6 +347,9 @@ class WebLocalFrame : public WebFrame {
|
2018-09-14 18:03:43 +00:00
|
|
|
// be calling this API.
|
|
|
|
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
|
|
|
|
|
|
|
|
+ virtual v8::Local<v8::Context> WorldScriptContext(
|
|
|
|
+ v8::Isolate* isolate, int world_id) const = 0;
|
|
|
|
+
|
|
|
|
// Executes script in the context of the current page and returns the value
|
|
|
|
// that the script evaluated to with callback. Script execution can be
|
|
|
|
// suspend.
|
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-01-17 18:41:52 +00:00
|
|
|
index 3de275c61ba6d1aa612de9036253906e4eb5638a..3912a5797fad331ab8b754abe9474b63f1a468df 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-01-17 18:41:52 +00:00
|
|
|
@@ -956,6 +956,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-01-17 18:41:52 +00:00
|
|
|
index 8e28c1d87211567636b9e291c3969bd00c78ff38..585dd302815e51e33e03e3c5db2d3ea1621d0b4b 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-01-17 18:41:52 +00:00
|
|
|
@@ -172,6 +172,8 @@ class CORE_EXPORT WebLocalFrameImpl final
|
2018-09-14 05:02:16 +00:00
|
|
|
int argc,
|
|
|
|
v8::Local<v8::Value> argv[]) override;
|
|
|
|
v8::Local<v8::Context> MainWorldScriptContext() const override;
|
|
|
|
+ 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;
|