Merge pull request #4678 from Tyriar/vscode189753

Workaround crash that can happen in Electron/Chromium
xtermjs · Aug 15, 2023 · 2eca26b · 2eca26b
2 parents c908eee + 2ca0ccb
commit 2eca26b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/browser/renderer/dom/StyleSheet.ts b/src/browser/renderer/dom/StyleSheet.ts
@@ -3,6 +3,8 @@
  * @license MIT
  */
 
+import { isElectron } from 'common/Platform';
+
 export interface IStyleSheet {
   dispose: () => void;
   setCss: (value: string) => void;
@@ -37,9 +39,12 @@ const createStyleElement = (parent: HTMLElement): IStyleSheet => {
 };
 
 export const createStyle = (parent: HTMLElement): IStyleSheet => {
-  try {
-    return createCssStyleSheet(parent.ownerDocument);
-  } catch {
-    return createStyleElement(parent);
+  // The combination of the CSP workaround and the DOM renderer can trigger a crash in electron
+  // https://github.com/microsoft/vscode/issues/189753
+  if (!isElectron) {
+    try {
+      return createCssStyleSheet(parent.ownerDocument);
+    } catch { /* Fall through */ }
   }
+  return createStyleElement(parent);
 };
diff --git a/src/common/Platform.ts b/src/common/Platform.ts
@@ -17,6 +17,7 @@ export const isNode = (typeof navigator === 'undefined') ? true : false;
 const userAgent = (isNode) ? 'node' : navigator.userAgent;
 const platform = (isNode) ? 'node' : navigator.platform;
 
+export const isElectron = userAgent.includes('Electron');
 export const isFirefox = userAgent.includes('Firefox');
 export const isLegacyEdge = userAgent.includes('Edge');
 export const isSafari = /^((?!chrome|android).)*safari/i.test(userAgent);