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

refactor: remove duplicate contextIsolation from getWebPreference() (#31730)

Browse source
This commit is contained in:
Milan Burda 2021-11-08 17:57:56 +01:00 • committed by GitHub
parent 4af21a1df8
commit fe7f296339
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/renderer/init.ts
View file

@ -71,7 +71,6 @@ webFrameInit();
const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_command_line');
const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
const contextIsolation = mainFrame.getWebPreference('contextIsolation');
const nodeIntegration = mainFrame.getWebPreference('nodeIntegration');
const webviewTag = mainFrame.getWebPreference('webviewTag');
const isHiddenPage = mainFrame.getWebPreference('hiddenPage');
@ -109,7 +108,7 @@ switch (window.location.protocol) {
// Load webview tag implementation.
if (process.isMainFrame) {
const { webViewInit } = require('@electron/internal/renderer/web-view/web-view-init') as typeof webViewInitModule;
webViewInit(contextIsolation, webviewTag, isWebView);
webViewInit(webviewTag, isWebView);
}
if (nodeIntegration) {
@ -166,7 +165,7 @@ if (nodeIntegration) {
} else {
// Delete Node's symbols after the Environment has been loaded in a
// non context-isolated environment
if (!contextIsolation) {
if (!process.contextIsolated) {
process.once('loaded', function () {
delete (global as any).process;
delete (global as any).Buffer;