Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[web] Fix crash on old versions of Chrome (Intl.Segmenter missing) #41986

Merged
merged 3 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/web_ui/lib/src/engine/browser_detection.dart
Original file line number Diff line number Diff line change
Expand Up @@ -268,4 +268,5 @@ int _detectWebGLVersion() {
}

/// Whether the current browser supports the Chromium variant of CanvasKit.
bool get browserSupportsCanvaskitChromium => domIntl.v8BreakIterator != null;
bool get browserSupportsCanvaskitChromium =>
domIntl.v8BreakIterator != null && domIntl.Segmenter != null;
17 changes: 17 additions & 0 deletions lib/web_ui/test/engine/browser_detect_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,15 @@ void testMain() {

group('browserSupportsCanvasKitChromium', () {
late dynamic oldV8BreakIterator = v8BreakIterator;
late dynamic oldIntlSegmenter = intlSegmenter;

setUp(() {
oldV8BreakIterator = v8BreakIterator;
oldIntlSegmenter = intlSegmenter;
});
tearDown(() {
v8BreakIterator = oldV8BreakIterator;
intlSegmenter = oldIntlSegmenter;
debugResetBrowserSupportsImageDecoder();
});

Expand Down Expand Up @@ -195,6 +199,13 @@ void testMain() {

expect(browserSupportsCanvaskitChromium, isFalse);
});

test('Detect browsers that support v8BreakIterator but no Intl.Segmenter', () {
v8BreakIterator = Object(); // Any non-null value.
intlSegmenter = null;

expect(browserSupportsCanvaskitChromium, isFalse);
});
});

group('OffscreenCanvas', () {
Expand All @@ -211,3 +222,9 @@ external dynamic get v8BreakIterator;

@JS('window.Intl.v8BreakIterator')
external set v8BreakIterator(dynamic x);

@JS('window.Intl.Segmenter')
external dynamic get intlSegmenter;

@JS('window.Intl.Segmenter')
external set intlSegmenter(dynamic x);