feat: replace BrowserView with WebContentsView (#35658)
This commit is contained in:
parent
a94fb2cb5d
commit
15c6014324
76 changed files with 2987 additions and 1531 deletions
|
@ -1,6 +1,6 @@
|
|||
import { expect } from 'chai';
|
||||
import * as cp from 'node:child_process';
|
||||
import { BrowserWindow, BrowserWindowConstructorOptions, ipcMain } from 'electron/main';
|
||||
import { BaseWindow, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, WebContents, WebContentsView } from 'electron/main';
|
||||
import * as path from 'node:path';
|
||||
|
||||
import { closeWindow } from './lib/window-helpers';
|
||||
|
@ -11,16 +11,16 @@ import { setTimeout } from 'node:timers/promises';
|
|||
// visibilityState specs pass on linux with a real window manager but on CI
|
||||
// the environment does not let these specs pass
|
||||
ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
|
||||
let w: BrowserWindow;
|
||||
let w: BaseWindow & {webContents: WebContents};
|
||||
|
||||
afterEach(() => {
|
||||
return closeWindow(w);
|
||||
});
|
||||
|
||||
const load = () => w.loadFile(path.resolve(__dirname, 'fixtures', 'chromium', 'visibilitystate.html'));
|
||||
const load = () => w.webContents.loadFile(path.resolve(__dirname, 'fixtures', 'chromium', 'visibilitystate.html'));
|
||||
|
||||
const itWithOptions = (name: string, options: BrowserWindowConstructorOptions, fn: Mocha.Func) => {
|
||||
return it(name, async function (...args) {
|
||||
it(name, async function (...args) {
|
||||
w = new BrowserWindow({
|
||||
...options,
|
||||
paintWhenInitiallyHidden: false,
|
||||
|
@ -32,6 +32,16 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
|
|||
});
|
||||
await Promise.resolve(fn.apply(this, args));
|
||||
});
|
||||
|
||||
it(name + ' with BaseWindow', async function (...args) {
|
||||
const baseWindow = new BaseWindow({
|
||||
...options
|
||||
});
|
||||
const wcv = new WebContentsView({ webPreferences: { ...(options.webPreferences ?? {}), nodeIntegration: true, contextIsolation: false } });
|
||||
baseWindow.contentView = wcv;
|
||||
w = Object.assign(baseWindow, { webContents: wcv.webContents });
|
||||
await Promise.resolve(fn.apply(this, args));
|
||||
});
|
||||
};
|
||||
|
||||
itWithOptions('should be visible when the window is initially shown by default', {}, async () => {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue