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_render_frame_observer.cc
View file

@ -81,7 +81,8 @@ void AtomRenderFrameObserver::DidCreateScriptContext(
if (should_create_isolated_context) {
CreateIsolatedWorldContext();
renderer_client_->SetupMainWorldOverrides(context, render_frame_);
if (!renderer_client_->IsWebViewFrame(context, render_frame_))
renderer_client_->SetupMainWorldOverrides(context, render_frame_);
}
if (world_id >= World::ISOLATED_WORLD_EXTENSIONS &&