Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix: falsy transparent shouldn't affect webContents background (#36914)

David Sanders 1 year ago
parent
d95f9d2c63
commit
a26343f3e0
5 changed files with 65 additions and 15 deletions
Split View Show Diff Stats
  1. 4 11
      lib/browser/api/web-contents.ts
  2. 1 1
      shell/browser/web_contents_preferences.cc
  3. 27 1
      spec/api-browser-window-spec.ts
  4. 31 1
      spec/guest-window-manager-spec.ts
  5. 2 1
      spec/lib/screen-helpers.ts

+ 4 - 11
lib/browser/api/web-contents.ts
View File 

@@ -519,17 +519,10 @@ WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event,
 
     event.preventDefault();
 
     return defaultResponse;
 
   } else if (response.action === 'allow') {
 
-    if (typeof response.overrideBrowserWindowOptions === 'object' && response.overrideBrowserWindowOptions !== null) {
 
-      return {
 
-        browserWindowConstructorOptions: response.overrideBrowserWindowOptions,
 
-        outlivesOpener: typeof response.outlivesOpener === 'boolean' ? response.outlivesOpener : false
 
-      };
 
-    } else {
 
-      return {
 
-        browserWindowConstructorOptions: {},
 
-        outlivesOpener: typeof response.outlivesOpener === 'boolean' ? response.outlivesOpener : false
 
-      };
 
-    }
 
+    return {
 
+      browserWindowConstructorOptions: typeof response.overrideBrowserWindowOptions === 'object' ? response.overrideBrowserWindowOptions : null,
 
+      outlivesOpener: typeof response.outlivesOpener === 'boolean' ? response.outlivesOpener : false
 
+    };
 
   } else {
 
     event.preventDefault();
 
     console.error('The window open handler response must be an object with an \'action\' property of \'allow\' or \'deny\'.');

+ 1 - 1
shell/browser/web_contents_preferences.cc
View File 

@@ -226,7 +226,7 @@ void WebContentsPreferences::SetFromDictionary(
 
   // preferences don't save a transparency option,
 
   // apply any existing transparency setting to background_color_
 
   bool transparent;
 
-  if (web_preferences.Get(options::kTransparent, &transparent)) {
 
+  if (web_preferences.Get(options::kTransparent, &transparent) && transparent) {
 
     background_color_ = SK_ColorTRANSPARENT;
 
   }
 
   std::string background_color;

+ 27 - 1
spec/api-browser-window-spec.ts
View File 

@@ -6012,7 +6012,7 @@ describe('BrowserWindow module', () => {
 
     });
 
 
     // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
 
-    ifit(process.platform === 'darwin' && process.arch !== 'x64')('should not display a visible background', async () => {
 
+    ifit(process.platform === 'darwin' && process.arch === 'x64')('should not display a visible background', async () => {
 
       const display = screen.getPrimaryDisplay();
 
 
       const backgroundWindow = new BrowserWindow({
 
@@ -6085,6 +6085,32 @@ describe('BrowserWindow module', () => {
 
 
       expect(areColorsSimilar(centerColor, HexColors.PURPLE)).to.be.true();
 
     });
 
+
 
+    // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
 
+    ifit(process.platform === 'darwin' && process.arch === 'x64')('should not make background transparent if falsy', async () => {
 
+      const display = screen.getPrimaryDisplay();
 
+
 
+      for (const transparent of [false, undefined]) {
 
+        const window = new BrowserWindow({
 
+          ...display.bounds,
 
+          transparent
 
+        });
 
+
 
+        await once(window, 'show');
 
+        await window.webContents.loadURL('data:text/html,<head><meta name="color-scheme" content="dark"></head>');
 
+
 
+        await setTimeout(500);
 
+        const screenCapture = await captureScreen();
 
+        const centerColor = getPixelColor(screenCapture, {
 
+          x: display.size.width / 2,
 
+          y: display.size.height / 2
 
+        });
 
+        window.close();
 
+
 
+        // color-scheme is set to dark so background should not be white
 
+        expect(areColorsSimilar(centerColor, HexColors.WHITE)).to.be.false();
 
+      }
 
+    });
 
   });
 
 
   describe('"backgroundColor" option', () => {

+ 31 - 1
spec/guest-window-manager-spec.ts
View File 

@@ -1,7 +1,10 @@
 
-import { BrowserWindow } from 'electron';
 
+import { BrowserWindow, screen } from 'electron';
 
 import { expect, assert } from 'chai';
 
+import { areColorsSimilar, captureScreen, HexColors, getPixelColor } from './lib/screen-helpers';
 
+import { ifit } from './lib/spec-helpers';
 
 import { closeAllWindows } from './lib/window-helpers';
 
 import { once } from 'events';
 
+import { setTimeout as setTimeoutAsync } from 'timers/promises';
 
 
 describe('webContents.setWindowOpenHandler', () => {
 
   let browserWindow: BrowserWindow;
 
@@ -193,4 +196,31 @@ describe('webContents.setWindowOpenHandler', () => {
 
     browserWindow.webContents.executeJavaScript("window.open('https://127.0.0.1')");
 
     expect(await browserWindow.webContents.executeJavaScript('42')).to.equal(42);
 
   });
 
+
 
+  // Linux and arm64 platforms (WOA and macOS) do not return any capture sources
 
+  ifit(process.platform === 'darwin' && process.arch === 'x64')('should not make child window background transparent', (done) => {
 
+    browserWindow.webContents.setWindowOpenHandler(() => ({ action: 'allow' }));
 
+
 
+    browserWindow.webContents.once('did-create-window', async (childWindow) => {
 
+      const display = screen.getPrimaryDisplay();
 
+      childWindow.setBounds(display.bounds);
 
+      await childWindow.webContents.executeJavaScript("const meta = document.createElement('meta'); meta.name = 'color-scheme'; meta.content = 'dark'; document.head.appendChild(meta); true;");
 
+      await setTimeoutAsync(1000);
 
+      const screenCapture = await captureScreen();
 
+      const centerColor = getPixelColor(screenCapture, {
 
+        x: display.size.width / 2,
 
+        y: display.size.height / 2
 
+      });
 
+
 
+      try {
 
+        // color-scheme is set to dark so background should not be white
 
+        expect(areColorsSimilar(centerColor, HexColors.WHITE)).to.be.false();
 
+        done();
 
+      } catch (err) {
 
+        done(err);
 
+      }
 
+    });
 
+
 
+    browserWindow.webContents.executeJavaScript("window.open('about:blank') && true");
 
+  });
 
 });

+ 2 - 1
spec/lib/screen-helpers.ts
View File 

@@ -8,7 +8,8 @@ export enum HexColors {
 
   GREEN = '#00b140',
 
   PURPLE = '#6a0dad',
 
   RED = '#ff0000',
 
-  BLUE = '#0000ff'
 
+  BLUE = '#0000ff',
 
+  WHITE = '#ffffff'
 
 };
 
 
 /**