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
|
|
|
|
index 601242f8df12..8cb523f82df0 100644
|
|
|
|
--- a/third_party/blink/public/web/web_local_frame.h
|
|
|
|
+++ b/third_party/blink/public/web/web_local_frame.h
|
|
|
|
@@ -427,6 +427,9 @@ class WebLocalFrame : public WebFrame {
|
|
|
|
// 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
|
2018-09-14 18:03:43 +00:00
|
|
|
index db86ae3c5eb4..602841d00df4 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
|
2018-09-14 18:03:43 +00:00
|
|
|
@@ -892,6 +892,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
|
2018-09-14 18:03:43 +00:00
|
|
|
index 0adc92eb48f2..a17891ce397c 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
|
2018-09-14 18:03:43 +00:00
|
|
|
@@ -144,6 +144,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;
|
|
|
|
v8::Local<v8::Object> GlobalProxy() const override;
|
|
|
|
void Reload(WebFrameLoadType) override;
|
2018-09-14 18:03:43 +00:00
|
|
|
void ReloadImage(const WebNode&) override;
|