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

fix: don't execute preload scripts for internal <iframe> in <webview> (#19260)

Browse source
This commit is contained in:
Milan Burda 2019-07-17 02:13:05 +02:00 • committed by Cheng Zhao
parent b57e623c11
commit d1c9f5e309
7 changed files with 81 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
shell/renderer/atom_sandboxed_renderer_client.cc
View file

@ -208,7 +208,8 @@ void AtomSandboxedRendererClient::DidCreateScriptContext(
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kNodeIntegrationInSubFrames);
bool should_load_preload =
is_main_frame || is_devtools || allow_node_in_sub_frames;
(is_main_frame || is_devtools || allow_node_in_sub_frames) &&
!IsWebViewFrame(context, render_frame);
if (!should_load_preload)
return;