From 2aee19f0e1b262f5c6bec1f88638439cbfcdaa68 Mon Sep 17 00:00:00 2001 From: Daniel Imms <2193314+Tyriar@users.noreply.github.com> Date: Tue, 15 Aug 2023 08:31:34 -0700 Subject: [PATCH] Revert "Workaround crash that can happen in Electron/Chromium" This reverts commit 2ca0ccbe0c57acfcf5cc61ac2e6922577331a130. --- src/browser/renderer/dom/StyleSheet.ts | 13 ++++--------- src/common/Platform.ts | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/browser/renderer/dom/StyleSheet.ts b/src/browser/renderer/dom/StyleSheet.ts index a4c52da4..574615f4 100644 --- a/src/browser/renderer/dom/StyleSheet.ts +++ b/src/browser/renderer/dom/StyleSheet.ts @@ -3,8 +3,6 @@ * @license MIT */ -import { isElectron } from 'common/Platform'; - export interface IStyleSheet { dispose: () => void; setCss: (value: string) => void; @@ -39,12 +37,9 @@ const createStyleElement = (parent: HTMLElement): IStyleSheet => { }; export const createStyle = (parent: HTMLElement): IStyleSheet => { - // 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 */ } + try { + return createCssStyleSheet(parent.ownerDocument); + } catch { + return createStyleElement(parent); } - return createStyleElement(parent); }; diff --git a/src/common/Platform.ts b/src/common/Platform.ts index 27dc97cf..41d8552e 100644 --- a/src/common/Platform.ts +++ b/src/common/Platform.ts @@ -17,7 +17,6 @@ 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);