Revert "Workaround crash that can happen in Electron/Chromium"
This reverts commit 2ca0ccbe0c.
This commit is contained in:
@@ -3,8 +3,6 @@
|
|||||||
* @license MIT
|
* @license MIT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { isElectron } from 'common/Platform';
|
|
||||||
|
|
||||||
export interface IStyleSheet {
|
export interface IStyleSheet {
|
||||||
dispose: () => void;
|
dispose: () => void;
|
||||||
setCss: (value: string) => void;
|
setCss: (value: string) => void;
|
||||||
@@ -39,12 +37,9 @@ const createStyleElement = (parent: HTMLElement): IStyleSheet => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const createStyle = (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
|
try {
|
||||||
// https://github.com/microsoft/vscode/issues/189753
|
return createCssStyleSheet(parent.ownerDocument);
|
||||||
if (!isElectron) {
|
} catch {
|
||||||
try {
|
return createStyleElement(parent);
|
||||||
return createCssStyleSheet(parent.ownerDocument);
|
|
||||||
} catch { /* Fall through */ }
|
|
||||||
}
|
}
|
||||||
return createStyleElement(parent);
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ export const isNode = (typeof navigator === 'undefined') ? true : false;
|
|||||||
const userAgent = (isNode) ? 'node' : navigator.userAgent;
|
const userAgent = (isNode) ? 'node' : navigator.userAgent;
|
||||||
const platform = (isNode) ? 'node' : navigator.platform;
|
const platform = (isNode) ? 'node' : navigator.platform;
|
||||||
|
|
||||||
export const isElectron = userAgent.includes('Electron');
|
|
||||||
export const isFirefox = userAgent.includes('Firefox');
|
export const isFirefox = userAgent.includes('Firefox');
|
||||||
export const isLegacyEdge = userAgent.includes('Edge');
|
export const isLegacyEdge = userAgent.includes('Edge');
|
||||||
export const isSafari = /^((?!chrome|android).)*safari/i.test(userAgent);
|
export const isSafari = /^((?!chrome|android).)*safari/i.test(userAgent);
|
||||||
|
|||||||
Reference in New Issue
Block a user