Skip to content

Commit f4a6761

Browse files
committed
[web] Enable measured desktop hybrid Skwasm defaults
1 parent e0773ad commit f4a6761

3 files changed

Lines changed: 32 additions & 4 deletions

File tree

‎engine/src/flutter/lib/web_ui/lib/src/engine/configuration.dart‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,9 @@ class FlutterConfiguration {
297297
/// Uses direct transferred-canvas presentation for single-canvas Skwasm
298298
/// scenes, and bitmap presentation when multiple surfaces are needed.
299299
///
300-
/// Disabled unless explicitly enabled. JavaScript configuration takes
300+
/// Enabled by default for desktop WebKit, Firefox, and single-threaded
301+
/// Chromium. Mobile, multi-threaded Chromium, and Wimp require explicit opt-in.
302+
/// JavaScript configuration takes
301303
/// precedence over the Dart define.
302304
bool? get skwasmUseHybridRasterizer =>
303305
_configuration?.skwasmUseHybridRasterizer ??

‎engine/src/flutter/lib/web_ui/lib/src/engine/skwasm/skwasm_impl/renderer.dart‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,14 @@ class SkwasmRenderer extends Renderer {
2424
Surface? _pictureToImageSurface;
2525

2626
Rasterizer _createRasterizer() {
27-
final bool useHybrid = configuration.skwasmUseHybridRasterizer ?? false;
27+
// Measurements cover the Skia-backed runtime on desktop. Keep mobile,
28+
// Wimp, and multi-threaded Chromium opt-in until separately qualified.
29+
// Use the loaded runtime's mode, since worker support also affects it.
30+
final bool useHybrid =
31+
configuration.skwasmUseHybridRasterizer ??
32+
(!isWimp &&
33+
ui_web.browser.isDesktop &&
34+
(ui_web.browser.browserEngine != ui_web.BrowserEngine.blink || !isMultiThreaded));
2835
if (useHybrid && browserSupportsTransferControlToOffscreen) {
2936
return HybridCanvasRasterizer(
3037
(OnscreenCanvasProvider provider) => SkwasmOnscreenSurface(provider),

‎engine/src/flutter/lib/web_ui/test/skwasm/renderer_test.dart‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,32 @@ void testMain() {
3333
});
3434

3535
for (final ui_web.BrowserEngine engine in ui_web.BrowserEngine.values) {
36-
test('requires opt-in on every platform for $engine', () {
36+
test('selects the measured desktop defaults for $engine', () {
3737
ui_web.browser.debugBrowserEngineOverride = engine;
3838
for (final ui_web.OperatingSystem os in ui_web.OperatingSystem.values) {
3939
ui_web.browser.debugOperatingSystemOverride = os;
4040
testRenderer.rasterizer.dispose();
4141
testRenderer.debugResetRasterizer();
42-
expect(testRenderer.rasterizer, isA<OffscreenCanvasRasterizer>(), reason: '$os');
42+
final desktopDefaults = <ui_web.BrowserEngine, bool>{
43+
ui_web.BrowserEngine.blink: !testRenderer.isMultiThreaded,
44+
ui_web.BrowserEngine.webkit: true,
45+
ui_web.BrowserEngine.firefox: true,
46+
};
47+
final bool isDesktop = <ui_web.OperatingSystem>[
48+
ui_web.OperatingSystem.linux,
49+
ui_web.OperatingSystem.windows,
50+
ui_web.OperatingSystem.macOs,
51+
].contains(os);
52+
final bool expectedHybrid =
53+
!testRenderer.isWimp &&
54+
isDesktop &&
55+
desktopDefaults[engine]! &&
56+
browserSupportsTransferControlToOffscreen;
57+
expect(
58+
testRenderer.rasterizer,
59+
expectedHybrid ? isA<HybridCanvasRasterizer>() : isA<OffscreenCanvasRasterizer>(),
60+
reason: '$os',
61+
);
4362
}
4463
});
4564
}

0 commit comments

Comments
 (0)