mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: register webview in main world when using contextIsolation (#16067)

Browse source
This commit is contained in:
Cheng Zhao 2018-12-14 15:38:35 +09:00 • committed by GitHub
parent dbda1a1b05
commit 8584c2f14b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 56 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/renderer/api/atom_api_web_frame.cc
View file

@ -189,8 +189,10 @@ void WebFrame::SetLayoutZoomLevelLimits(double min_level, double max_level) {
}
v8::Local<v8::Value> WebFrame::RegisterEmbedderCustomElement(
v8::Local<v8::Object> context,
const base::string16& name,
v8::Local<v8::Object> options) {
v8::Context::Scope context_scope(context->CreationContext());
return web_frame_->GetDocument().RegisterEmbedderCustomElement(
blink::WebString::FromUTF16(name), options);
}

1
atom/renderer/api/atom_api_web_frame.h
View file

@ -51,6 +51,7 @@ class WebFrame : public mate::Wrappable<WebFrame> {
void SetLayoutZoomLevelLimits(double min_level, double max_level);
v8::Local<v8::Value> RegisterEmbedderCustomElement(
v8::Local<v8::Object> context,
const base::string16& name,
v8::Local<v8::Object> options);
int GetWebFrameId(v8::Local<v8::Value> content_window);