Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit e672b00

Browse files
christopherfujinochristopherfujino
authored
[flutter_releases] Flutter stable 3.27.2 Engine Cherrypicks (#57271)
# Flutter stable 3.27.2 Engine ## Scheduled Cherrypicks - Roll dart revision: dart-lang/sdk@1bf43bfd3 ## Infra Cherrypicks - 1af2217 - 6b022df
1 parent 41bb2f4 commit e672b00

File tree

3 files changed

+52
-95
lines changed

3 files changed

+52
-95
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ vars = {
5656
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
5757
# You can use //tools/dart/create_updated_flutter_deps.py to produce
5858
# updated revision list of existing dependencies.
59-
'dart_revision': 'ae7ca5199a0559db0ae60533e9cedd3ce0d6ab04',
59+
'dart_revision': '1bf43bfd314768e235f6e5618842469bab6494bd',
6060

6161
# WARNING: DO NOT EDIT MANUALLY
6262
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py

‎ci/builders/mac_unopt.json‎

Lines changed: 39 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"drone_dimensions": [
66
"device_type=none",
77
"os=Mac-13|Mac-14",
8-
"cpu=x86",
9-
"mac_model=Macmini8,1"
8+
"cpu=arm64"
109
],
1110
"gclient_variables": {
1211
"download_android_deps": false,
@@ -15,22 +14,23 @@
1514
},
1615
"gn": [
1716
"--target-dir",
18-
"ci/host_debug_tests",
17+
"ci/host_debug_arm64_tests",
1918
"--runtime-mode",
2019
"debug",
20+
"--mac-cpu",
21+
"arm64",
2122
"--no-lto",
2223
"--prebuilt-dart-sdk",
2324
"--build-embedder-examples",
2425
"--use-glfw-swiftshader",
2526
"--rbe",
2627
"--no-goma",
2728
"--xcode-symlinks"
28-
2929
],
30-
"name": "ci/host_debug_tests",
31-
"description": "Produces debug mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
30+
"name": "ci/host_debug_arm64_tests",
31+
"description": "Produces debug mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
3232
"ninja": {
33-
"config": "ci/host_debug_tests",
33+
"config": "ci/host_debug_arm64_tests",
3434
"targets": []
3535
},
3636
"properties": {
@@ -44,8 +44,9 @@
4444
"name": "Host Tests for host_debug",
4545
"script": "flutter/testing/run_tests.py",
4646
"parameters": [
47+
"--quiet",
4748
"--variant",
48-
"ci/host_debug_tests",
49+
"ci/host_debug_arm64_tests",
4950
"--type",
5051
"dart,dart-host,engine",
5152
"--engine-capture-core-dump"
@@ -58,29 +59,30 @@
5859
"drone_dimensions": [
5960
"device_type=none",
6061
"os=Mac-13|Mac-14",
61-
"cpu=x86",
62-
"mac_model=Macmini8,1"
62+
"cpu=arm64"
6363
],
6464
"gclient_variables": {
6565
"download_android_deps": false,
6666
"use_rbe": true
6767
},
6868
"gn": [
6969
"--target-dir",
70-
"ci/host_profile_tests",
70+
"ci/host_profile_arm64_tests",
7171
"--runtime-mode",
7272
"profile",
73+
"--mac-cpu",
74+
"arm64",
7375
"--no-lto",
7476
"--prebuilt-dart-sdk",
7577
"--build-embedder-examples",
7678
"--rbe",
7779
"--no-goma",
7880
"--xcode-symlinks"
7981
],
80-
"name": "ci/host_profile_tests",
81-
"description": "Produces profile mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
82+
"name": "ci/host_profile_arm64_tests",
83+
"description": "Produces profile mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
8284
"ninja": {
83-
"config": "ci/host_profile_tests",
85+
"config": "ci/host_profile_arm64_tests",
8486
"targets": []
8587
},
8688
"properties": {
@@ -94,8 +96,9 @@
9496
"name": "Host Tests for host_profile",
9597
"script": "flutter/testing/run_tests.py",
9698
"parameters": [
99+
"--quiet",
97100
"--variant",
98-
"ci/host_profile_tests",
101+
"ci/host_profile_arm64_tests",
99102
"--type",
100103
"dart,dart-host,engine",
101104
"--engine-capture-core-dump"
@@ -108,24 +111,19 @@
108111
"drone_dimensions": [
109112
"device_type=none",
110113
"os=Mac-13|Mac-14",
111-
"cpu=x86",
112-
"mac_model=Macmini8,1"
113-
],
114-
"dependencies": [
115-
{
116-
"dependency": "goldctl",
117-
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
118-
}
114+
"cpu=arm64"
119115
],
120116
"gclient_variables": {
121117
"download_android_deps": false,
122118
"use_rbe": true
123119
},
124120
"gn": [
125121
"--target-dir",
126-
"ci/host_release_tests",
122+
"ci/host_release_arm64_tests",
127123
"--runtime-mode",
128124
"release",
125+
"--mac-cpu",
126+
"arm64",
129127
"--no-lto",
130128
"--prebuilt-dart-sdk",
131129
"--build-embedder-examples",
@@ -134,10 +132,10 @@
134132
"--no-goma",
135133
"--xcode-symlinks"
136134
],
137-
"name": "ci/host_release_tests",
138-
"description": "Produces release mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
135+
"name": "ci/host_release_arm64_tests",
136+
"description": "Produces release mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
139137
"ninja": {
140-
"config": "ci/host_release_tests",
138+
"config": "ci/host_release_arm64_tests",
141139
"targets": []
142140
},
143141
"properties": {
@@ -148,11 +146,12 @@
148146
"tests": [
149147
{
150148
"language": "python3",
151-
"name": "Impeller-golden, dart and engine tests for host_release",
149+
"name": "Dart and engine tests for host_release",
152150
"script": "flutter/testing/run_tests.py",
153151
"parameters": [
152+
"--quiet",
154153
"--variant",
155-
"ci/host_release_tests",
154+
"ci/host_release_arm64_tests",
156155
"--type",
157156
"dart,dart-host,engine"
158157
]
@@ -208,6 +207,7 @@
208207
"name": "Impeller-golden for host_release",
209208
"script": "flutter/testing/run_tests.py",
210209
"parameters": [
210+
"--quiet",
211211
"--variant",
212212
"ci/mac_release_arm64_tests",
213213
"--type",
@@ -216,62 +216,6 @@
216216
}
217217
]
218218
},
219-
{
220-
"cas_archive": false,
221-
"drone_dimensions": [
222-
"device_type=none",
223-
"os=Mac-13|Mac-14",
224-
"cpu=x86",
225-
"mac_model=Macmini8,1"
226-
],
227-
"gclient_variables": {
228-
"download_android_deps": false,
229-
"use_rbe": true
230-
},
231-
"gn": [
232-
"--target-dir",
233-
"ci/host_debug_unopt",
234-
"--runtime-mode",
235-
"debug",
236-
"--unoptimized",
237-
"--no-lto",
238-
"--prebuilt-dart-sdk",
239-
"--enable-impeller-3d",
240-
"--rbe",
241-
"--no-goma",
242-
"--xcode-symlinks"
243-
],
244-
"name": "ci/host_debug_unopt",
245-
"description": "Builds a debug mode unopt x64 macOS engine and runs host-side tests.",
246-
"ninja": {
247-
"config": "ci/host_debug_unopt",
248-
"targets": []
249-
},
250-
"properties": {
251-
"$flutter/osx_sdk": {
252-
"sdk_version": "15a240d"
253-
}
254-
},
255-
"tests": [
256-
{
257-
"language": "python3",
258-
"name": "Host Tests for host_debug_unopt",
259-
"script": "flutter/testing/run_tests.py",
260-
"parameters": [
261-
"--variant",
262-
"ci/host_debug_unopt",
263-
"--type",
264-
"dart,dart-host,engine",
265-
"--engine-capture-core-dump"
266-
]
267-
},
268-
{
269-
"name": "Tests of tools/gn",
270-
"language": "python3",
271-
"script": "flutter/tools/gn_test.py"
272-
}
273-
]
274-
},
275219
{
276220
"cas_archive": false,
277221
"properties": {
@@ -318,6 +262,7 @@
318262
"name": "Tests for ios_debug_unopt_sim",
319263
"script": "flutter/testing/run_tests.py",
320264
"parameters": [
265+
"--quiet",
321266
"--variant",
322267
"ci/ios_debug_unopt_sim",
323268
"--type",
@@ -358,6 +303,7 @@
358303
"--prebuilt-dart-sdk",
359304
"--mac-cpu",
360305
"arm64",
306+
"--enable-impeller-3d",
361307
"--rbe",
362308
"--no-goma",
363309
"--xcode-symlinks",
@@ -381,13 +327,19 @@
381327
"name": "Host Tests for host_debug_unopt_arm64",
382328
"script": "flutter/testing/run_tests.py",
383329
"parameters": [
330+
"--quiet",
384331
"--variant",
385332
"ci/host_debug_unopt_arm64",
386333
"--type",
387334
"dart,dart-host,engine,impeller-golden",
388335
"--engine-capture-core-dump",
389336
"--no-skia-gold"
390337
]
338+
},
339+
{
340+
"name": "Tests of tools/gn",
341+
"language": "python3",
342+
"script": "flutter/tools/gn_test.py"
391343
}
392344
]
393345
},
@@ -439,6 +391,7 @@
439391
"name": "Tests for ios_debug_unopt_sim_arm64",
440392
"script": "flutter/testing/run_tests.py",
441393
"parameters": [
394+
"--quiet",
442395
"--variant",
443396
"ci/ios_debug_unopt_sim_arm64",
444397
"--type",
@@ -507,6 +460,7 @@
507460
"name": "Tests for ios_debug_unopt_sim_arm64_extension_safe",
508461
"script": "flutter/testing/run_tests.py",
509462
"parameters": [
463+
"--quiet",
510464
"--variant",
511465
"ci/ios_debug_unopt_sim_arm64_extension_safe",
512466
"--type",

‎shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121

2222
#pragma mark - Test Helper Classes
2323

24+
static const FlutterPointerEvent kDefaultFlutterPointerEvent = {};
25+
static const FlutterKeyEvent kDefaultFlutterKeyEvent = {};
26+
2427
// A wrap to convert FlutterKeyEvent to a ObjC class.
2528
@interface KeyEventWrapper : NSObject
2629
@property(nonatomic) FlutterKeyEvent* data;
@@ -339,7 +342,7 @@ - (bool)testKeyEventsAreSentToFramework:(id)engineMock {
339342
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
340343
[engineMock binaryMessenger])
341344
.andReturn(binaryMessengerMock);
342-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
345+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
343346
callback:nil
344347
userData:nil])
345348
.andCall([FlutterViewControllerTestObjC class],
@@ -375,7 +378,7 @@ - (bool)testKeyEventsAreSentToFramework:(id)engineMock {
375378
- (bool)testCtrlTabKeyEventIsPropagated:(id)engineMock {
376379
__block bool called = false;
377380
__block FlutterKeyEvent last_event;
378-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
381+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
379382
callback:nil
380383
userData:nil])
381384
.andDo((^(NSInvocation* invocation) {
@@ -419,7 +422,7 @@ - (bool)testCtrlTabKeyEventIsPropagated:(id)engineMock {
419422
- (bool)testKeyEquivalentIsPassedToTextInputPlugin:(id)engineMock {
420423
__block bool called = false;
421424
__block FlutterKeyEvent last_event;
422-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
425+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
423426
callback:nil
424427
userData:nil])
425428
.andDo((^(NSInvocation* invocation) {
@@ -471,7 +474,7 @@ - (bool)testKeyEventsArePropagatedIfNotHandled:(id)engineMock {
471474
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
472475
[engineMock binaryMessenger])
473476
.andReturn(binaryMessengerMock);
474-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
477+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
475478
callback:nil
476479
userData:nil])
477480
.andCall([FlutterViewControllerTestObjC class],
@@ -545,7 +548,7 @@ - (bool)testFlagsChangedEventsArePropagatedIfNotHandled:(id)engineMock {
545548
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
546549
[engineMock binaryMessenger])
547550
.andReturn(binaryMessengerMock);
548-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
551+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
549552
callback:nil
550553
userData:nil])
551554
.andCall([FlutterViewControllerTestObjC class],
@@ -598,7 +601,7 @@ - (bool)testKeyEventsAreNotPropagatedIfHandled:(id)engineMock {
598601
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
599602
[engineMock binaryMessenger])
600603
.andReturn(binaryMessengerMock);
601-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
604+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
602605
callback:nil
603606
userData:nil])
604607
.andCall([FlutterViewControllerTestObjC class],
@@ -655,7 +658,7 @@ - (bool)testKeyboardIsRestartedOnEngineRestart:(id)engineMock {
655658
.andReturn(binaryMessengerMock);
656659
__block bool called = false;
657660
__block FlutterKeyEvent last_event;
658-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
661+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
659662
callback:nil
660663
userData:nil])
661664
.andDo((^(NSInvocation* invocation) {
@@ -715,7 +718,7 @@ - (bool)testTrackpadGesturesAreSentToFramework:(id)engineMock {
715718
OCMStub([engineMock renderer]).andReturn(renderer_);
716719
__block bool called = false;
717720
__block FlutterPointerEvent last_event;
718-
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:FlutterPointerEvent{}])
721+
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:kDefaultFlutterPointerEvent])
719722
.andDo((^(NSInvocation* invocation) {
720723
FlutterPointerEvent* event;
721724
[invocation getArgument:&event atIndex:2];
@@ -1139,7 +1142,7 @@ - (bool)testModifierKeysAreSynthesizedOnMouseMove:(id)engineMock {
11391142

11401143
// Capture calls to sendKeyEvent
11411144
__block NSMutableArray<KeyEventWrapper*>* events = [NSMutableArray array];
1142-
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
1145+
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
11431146
callback:nil
11441147
userData:nil])
11451148
.andDo((^(NSInvocation* invocation) {

0 commit comments

Comments
 (0)