Skip to content

Commit d7fe609

Browse files
authored
Enable Safari dart2wasm/skwasm CI suites on macOS 26.6 (flutter#193681)
This switches the Safari Web engine CI suites (`Mac run safari suites`) to run on `Mac-26.6` LUCI bots (matching the `Mac-26.6` dimension convention in flutter#193317) and enables the 4 WasmGC / Skwasm Safari suites now that Safari 26 (with Wasm `js-string` builtins) ships on macOS 26.6.2 bots (flutter#192559 / flutter#192572): - `safari-dart2wasm-canvaskit-engine` - `safari-dart2wasm-skwasm-ui` - `safari-coi-dart2wasm-skwasm-ui` - `safari-coi-dart2wasm-skwasm-skwasm` ### Safari 26 & WebDriver Focus Test Updates Running `Mac run safari suites` on `Mac-26.6` exposed two Safari 26 CSS `outline` serialization differences and one test that depended on `Safari.app` holding macOS WindowServer foreground focus under `safaridriver`: 1. **`text_editing_test.dart` (`text editing styles invisible element`)**: Safari 26 serializes inline `outline: none` on `input.style.outline` as `'medium'` (matching `input.style.border` immediately below it). 2. **`view_embedder/style_manager_test.dart` (`attachGlobalStyles hides the outline when focused`)**: Safari 26 serializes `getComputedStyle(element).outline` in canonical CSSOM order (`'0px none rgb(0, 0, 0)'` instead of `'rgb(0, 0, 0) none 0px'`). Additionally, in WebKit `:focus` only matches when `domDocument.hasFocus()` is `true`; when `Safari.app` is not the frontmost macOS WindowServer app (`!domDocument.hasFocus()`), WebKit returns the unfocused initial outline (`'3px none rgb(0, 0, 0)'`). 3. **`platform_dispatcher/view_focus_binding.dart` & `view_focus_binding_test.dart` (`works even if focus is changed in the middle of a blur call`)**: Use `_documentHasFocus` (introduced in flutter#190942 for `debugViewFocusDocumentHasFocusOverride`) in `ViewFocusBinding._handleFocusout` (`wasFocusInvoked`) and set `debugViewFocusDocumentHasFocusOverride = true` in the test so it does not flake when the `safaridriver` window is unfocused in WindowServer. Fixes flutter#193833 Fixes flutter#193834 Part of flutter#192559 Part of flutter#192572
1 parent 0f35e8d commit d7fe609

7 files changed

Lines changed: 62 additions & 14 deletions

File tree

‎engine/src/flutter/ci/builders/linux_web_engine_test.json‎

Lines changed: 44 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@
523523
"recipe": "engine_v2/tester_engine",
524524
"drone_dimensions": [
525525
"device_type=none",
526-
"os=Mac-15.7",
526+
"os=Mac-26.6",
527527
"cpu=arm64"
528528
],
529529
"gclient_variables": {
@@ -533,6 +533,9 @@
533533
"web_tests/test_bundles/dart2js-canvaskit-engine",
534534
"web_tests/test_bundles/dart2js-canvaskit-canvaskit",
535535
"web_tests/test_bundles/dart2js-canvaskit-ui",
536+
"web_tests/test_bundles/dart2wasm-canvaskit-engine",
537+
"web_tests/test_bundles/dart2wasm-skwasm-ui",
538+
"web_tests/test_bundles/dart2wasm-skwasm-skwasm",
536539
"web_tests/test_bundles/fallbacks"
537540
],
538541
"test_dependencies": [
@@ -550,6 +553,10 @@
550553
"--suite=safari-dart2js-canvaskit-engine",
551554
"--suite=safari-dart2js-canvaskit-canvaskit",
552555
"--suite=safari-dart2js-canvaskit-ui",
556+
"--suite=safari-dart2wasm-canvaskit-engine",
557+
"--suite=safari-dart2wasm-skwasm-ui",
558+
"--suite=safari-coi-dart2wasm-skwasm-ui",
559+
"--suite=safari-coi-dart2wasm-skwasm-skwasm",
553560
"--suite=safari-fallbacks"
554561
],
555562
"script": "flutter/lib/web_ui/dev/felt"
@@ -581,6 +588,42 @@
581588
],
582589
"script": "flutter/lib/web_ui/dev/felt"
583590
},
591+
{
592+
"name": "run suite safari-dart2wasm-canvaskit-engine",
593+
"parameters": [
594+
"test",
595+
"--run",
596+
"--suite=safari-dart2wasm-canvaskit-engine"
597+
],
598+
"script": "flutter/lib/web_ui/dev/felt"
599+
},
600+
{
601+
"name": "run suite safari-dart2wasm-skwasm-ui",
602+
"parameters": [
603+
"test",
604+
"--run",
605+
"--suite=safari-dart2wasm-skwasm-ui"
606+
],
607+
"script": "flutter/lib/web_ui/dev/felt"
608+
},
609+
{
610+
"name": "run suite safari-coi-dart2wasm-skwasm-ui",
611+
"parameters": [
612+
"test",
613+
"--run",
614+
"--suite=safari-coi-dart2wasm-skwasm-ui"
615+
],
616+
"script": "flutter/lib/web_ui/dev/felt"
617+
},
618+
{
619+
"name": "run suite safari-coi-dart2wasm-skwasm-skwasm",
620+
"parameters": [
621+
"test",
622+
"--run",
623+
"--suite=safari-coi-dart2wasm-skwasm-skwasm"
624+
],
625+
"script": "flutter/lib/web_ui/dev/felt"
626+
},
584627
{
585628
"name": "run suite safari-fallbacks",
586629
"parameters": [

‎engine/src/flutter/lib/web_ui/dev/generate_builder_json.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class GenerateBuilderJsonCommand extends Command<bool> {
102102
packageLock,
103103
'Mac',
104104
BrowserName.safari,
105-
specificOS: 'Mac-15.7',
105+
specificOS: 'Mac-26.6',
106106
cpu: 'arm64',
107107
),
108108
];

‎engine/src/flutter/lib/web_ui/lib/src/engine/platform_dispatcher/view_focus_binding.dart‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ final class ViewFocusBinding {
8888
// We leverage this behavior to ignore focusout events where the document has focus but activeElement is not <body />.
8989
//
9090
// Refer to https://github.com/flutter/engine/pull/54965 for more info.
91-
final bool wasFocusInvoked =
92-
domDocument.hasFocus() && domDocument.activeElement != domDocument.body;
91+
final bool wasFocusInvoked = _documentHasFocus && domDocument.activeElement != domDocument.body;
9392
if (wasFocusInvoked) {
9493
return;
9594
}

‎engine/src/flutter/lib/web_ui/test/engine/platform_dispatcher/view_focus_binding_test.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ void testMain() {
333333
});
334334

335335
test('works even if focus is changed in the middle of a blur call', () {
336+
debugViewFocusDocumentHasFocusOverride = true;
336337
final DomElement input1 = createDomElement('input');
337338
final DomElement input2 = createDomElement('input');
338339
final EngineFlutterView view = createAndRegisterView(dispatcher);

‎engine/src/flutter/lib/web_ui/test/engine/text_editing_test.dart‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4534,9 +4534,12 @@ Future<void> testMain() async {
45344534

45354535
expect(input.style.color, contains('transparent'));
45364536
if (isSafari) {
4537-
// macOS 13 returns different values than macOS 12.
4537+
// macOS 13+ / 26 returns different values than macOS 12.
45384538
expect(input.style.background, anyOf(contains('transparent'), contains('none')));
4539-
expect(input.style.outline, anyOf(contains('none'), contains('currentcolor')));
4539+
expect(
4540+
input.style.outline,
4541+
anyOf(contains('none'), contains('currentcolor'), contains('medium')),
4542+
);
45404543
expect(input.style.border, anyOf(contains('none'), contains('medium')));
45414544
} else {
45424545
expect(input.style.background, contains('transparent'));

‎engine/src/flutter/lib/web_ui/test/engine/view_embedder/style_manager_test.dart‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,16 @@ void doTests() {
2727
styleNonce: 'testing',
2828
cssSelectorPrefix: DomManager.flutterViewTagName,
2929
);
30-
final expected = isFirefox ? 'rgb(0, 0, 0) 0px' : 'rgb(0, 0, 0) none 0px';
30+
final Object expected = isFirefox
31+
? 'rgb(0, 0, 0) 0px'
32+
: anyOf(<String>[
33+
'rgb(0, 0, 0) none 0px',
34+
'0px none rgb(0, 0, 0)',
35+
// In WebKit, `:focus` does not match when the Safari window lacks
36+
// OS-level WindowServer focus (`!domDocument.hasFocus()`), returning
37+
// the initial unfocused outline width (`medium` = `3px`) with `none`.
38+
if (isSafari && !domDocument.hasFocus()) '3px none rgb(0, 0, 0)',
39+
]);
3140

3241
// Focus the element.
3342
flutterViewElement.focusWithoutScroll();

‎engine/src/flutter/lib/web_ui/test/felt_config.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -266,32 +266,25 @@ test-suites:
266266
run-config: safari
267267
artifact-deps: [ canvaskit ]
268268

269-
# Desktop Safari on LUCI Mac-15.7 bots is Safari 18.6, which lacks Wasm
270-
# js-string builtins (shipped in Safari 26.2 / macOS 26.2). Keep disabled in
271-
# CI until Mac tester bots upgrade to macOS 26.2+.
272269
- name: safari-dart2wasm-canvaskit-engine
273270
test-bundle: dart2wasm-canvaskit-engine
274271
run-config: safari-wasm
275272
artifact-deps: [ canvaskit ]
276-
enable-ci: false
277273

278274
- name: safari-dart2wasm-skwasm-ui
279275
test-bundle: dart2wasm-skwasm-ui
280276
run-config: safari-wasm
281277
artifact-deps: [ skwasm ]
282-
enable-ci: false
283278

284279
- name: safari-coi-dart2wasm-skwasm-ui
285280
test-bundle: dart2wasm-skwasm-ui
286281
run-config: safari-coi-wasm
287282
artifact-deps: [ skwasm ]
288-
enable-ci: false
289283

290284
- name: safari-coi-dart2wasm-skwasm-skwasm
291285
test-bundle: dart2wasm-skwasm-skwasm
292286
run-config: safari-coi-wasm
293287
artifact-deps: [ skwasm ]
294-
enable-ci: false
295288

296289
- name: chrome-dart2wasm-canvaskit-engine
297290
test-bundle: dart2wasm-canvaskit-engine

0 commit comments

Comments
 (0)