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 all commits
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;
25 changes: 24 additions & 1 deletion lib/web_ui/test/canvaskit/canvaskit_api_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1826,17 +1826,22 @@ void _paragraphTests() {
}, skip: isFirefox); // Intended: Headless firefox has no webgl support https://github.com/flutter/flutter/issues/109265

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

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

test('in Chromium-based browsers', () {
v8BreakIterator = Object(); // Any non-null value.
intlSegmenter = Object(); // Any non-null value.
browserSupportsImageDecoder = true;

expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
Expand All @@ -1847,7 +1852,19 @@ void _paragraphTests() {
]);
});

test('in older versions of Chromium-based browsers', () {
v8BreakIterator = Object(); // Any non-null value.
intlSegmenter = null; // Older versions of Chromium didn't have the Intl.Segmenter API.
browserSupportsImageDecoder = true;

expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
expect(getCanvasKitJsFileNames(CanvasKitVariant.chromium), <String>['chromium/canvaskit.js']);
expect(getCanvasKitJsFileNames(CanvasKitVariant.auto), <String>['canvaskit.js']);
});

test('in other browsers', () {
intlSegmenter = Object(); // Any non-null value.

v8BreakIterator = null;
browserSupportsImageDecoder = true;
expect(getCanvasKitJsFileNames(CanvasKitVariant.full), <String>['canvaskit.js']);
Expand Down Expand Up @@ -1901,3 +1918,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);
23 changes: 22 additions & 1 deletion lib/web_ui/test/engine/browser_detect_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -157,24 +157,30 @@ void testMain() {
});

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

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

test('Detect browsers that support CanvasKit Chromium', () {
v8BreakIterator = Object(); // Any non-null value.
intlSegmenter = Object(); // Any non-null value.
browserSupportsImageDecoder = true;

expect(browserSupportsCanvaskitChromium, isTrue);
});

test('Detect browsers that do not support image codecs', () {
v8BreakIterator = Object(); // Any non-null value.
intlSegmenter = Object(); // Any non-null value.
browserSupportsImageDecoder = false;

// TODO(mdebbar): we don't check image codecs for now.
Expand All @@ -184,17 +190,26 @@ void testMain() {

test('Detect browsers that do not support v8BreakIterator', () {
v8BreakIterator = null;
intlSegmenter = Object(); // Any non-null value.
browserSupportsImageDecoder = true;

expect(browserSupportsCanvaskitChromium, isFalse);
});

test('Detect browsers that support neither', () {
v8BreakIterator = null;
intlSegmenter = Object(); // Any non-null value.
browserSupportsImageDecoder = false;

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 +226,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);