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.

Sign up for GitHub

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

[flutter_releases] Flutter stable 3.27.2 Engine Cherrypicks #57271

Merged
merged 3 commits into from
Jan 10, 2025
+52 −95
Merged

[flutter_releases] Flutter stable 3.27.2 Engine Cherrypicks #57271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d63521
Update Dart SDK to 1bf43bfd314768e235f6e5618842469bab6494bd
christopherfujino Jan 9, 2025
d65125b
Switch some mac_unopt tests from intel to arm hosts (#55882)
zanderso Oct 28, 2024
00318ab
Fixes crash in testTrackpadGesturesAreSentToFramework (#55990)
gaaclarke Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': 'ae7ca5199a0559db0ae60533e9cedd3ce0d6ab04',
'dart_revision': '1bf43bfd314768e235f6e5618842469bab6494bd',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down
124 changes: 39 additions & 85 deletions ci/builders/mac_unopt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
Expand All @@ -15,22 +14,23 @@
},
"gn": [
"--target-dir",
"ci/host_debug_tests",
"ci/host_debug_arm64_tests",
"--runtime-mode",
"debug",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--use-glfw-swiftshader",
"--rbe",
"--no-goma",
"--xcode-symlinks"

],
"name": "ci/host_debug_tests",
"description": "Produces debug mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_debug_arm64_tests",
"description": "Produces debug mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_debug_tests",
"config": "ci/host_debug_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -44,8 +44,9 @@
"name": "Host Tests for host_debug",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_debug_tests",
"ci/host_debug_arm64_tests",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
Expand All @@ -58,29 +59,30 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_profile_tests",
"ci/host_profile_arm64_tests",
"--runtime-mode",
"profile",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
"--rbe",
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_profile_tests",
"description": "Produces profile mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_profile_arm64_tests",
"description": "Produces profile mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_profile_tests",
"config": "ci/host_profile_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -94,8 +96,9 @@
"name": "Host Tests for host_profile",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_profile_tests",
"ci/host_profile_arm64_tests",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
Expand All @@ -108,24 +111,19 @@
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
],
"dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
"cpu=arm64"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_release_tests",
"ci/host_release_arm64_tests",
"--runtime-mode",
"release",
"--mac-cpu",
"arm64",
"--no-lto",
"--prebuilt-dart-sdk",
"--build-embedder-examples",
Expand All @@ -134,10 +132,10 @@
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_release_tests",
"description": "Produces release mode x64 macOS host-side tooling and builds host-side unit tests for x64 macOS.",
"name": "ci/host_release_arm64_tests",
"description": "Produces release mode arm64 macOS host-side tooling and builds host-side unit tests for arm64 macOS.",
"ninja": {
"config": "ci/host_release_tests",
"config": "ci/host_release_arm64_tests",
"targets": []
},
"properties": {
Expand All @@ -148,11 +146,12 @@
"tests": [
{
"language": "python3",
"name": "Impeller-golden, dart and engine tests for host_release",
"name": "Dart and engine tests for host_release",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_release_tests",
"ci/host_release_arm64_tests",
"--type",
"dart,dart-host,engine"
]
Expand Down Expand Up @@ -208,6 +207,7 @@
"name": "Impeller-golden for host_release",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/mac_release_arm64_tests",
"--type",
Expand All @@ -216,62 +216,6 @@
}
]
},
{
"cas_archive": false,
"drone_dimensions": [
"device_type=none",
"os=Mac-13|Mac-14",
"cpu=x86",
"mac_model=Macmini8,1"
],
"gclient_variables": {
"download_android_deps": false,
"use_rbe": true
},
"gn": [
"--target-dir",
"ci/host_debug_unopt",
"--runtime-mode",
"debug",
"--unoptimized",
"--no-lto",
"--prebuilt-dart-sdk",
"--enable-impeller-3d",
"--rbe",
"--no-goma",
"--xcode-symlinks"
],
"name": "ci/host_debug_unopt",
"description": "Builds a debug mode unopt x64 macOS engine and runs host-side tests.",
"ninja": {
"config": "ci/host_debug_unopt",
"targets": []
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "15a240d"
}
},
"tests": [
{
"language": "python3",
"name": "Host Tests for host_debug_unopt",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--variant",
"ci/host_debug_unopt",
"--type",
"dart,dart-host,engine",
"--engine-capture-core-dump"
]
},
{
"name": "Tests of tools/gn",
"language": "python3",
"script": "flutter/tools/gn_test.py"
}
]
},
{
"cas_archive": false,
"properties": {
Expand Down Expand Up @@ -318,6 +262,7 @@
"name": "Tests for ios_debug_unopt_sim",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim",
"--type",
Expand Down Expand Up @@ -358,6 +303,7 @@
"--prebuilt-dart-sdk",
"--mac-cpu",
"arm64",
"--enable-impeller-3d",
"--rbe",
"--no-goma",
"--xcode-symlinks",
Expand All @@ -381,13 +327,19 @@
"name": "Host Tests for host_debug_unopt_arm64",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/host_debug_unopt_arm64",
"--type",
"dart,dart-host,engine,impeller-golden",
"--engine-capture-core-dump",
"--no-skia-gold"
]
},
{
"name": "Tests of tools/gn",
"language": "python3",
"script": "flutter/tools/gn_test.py"
}
]
},
Expand Down Expand Up @@ -439,6 +391,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim_arm64",
"--type",
Expand Down Expand Up @@ -507,6 +460,7 @@
"name": "Tests for ios_debug_unopt_sim_arm64_extension_safe",
"script": "flutter/testing/run_tests.py",
"parameters": [
"--quiet",
"--variant",
"ci/ios_debug_unopt_sim_arm64_extension_safe",
"--type",
Expand Down
21 changes: 12 additions & 9 deletions shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@

#pragma mark - Test Helper Classes

static const FlutterPointerEvent kDefaultFlutterPointerEvent = {};
static const FlutterKeyEvent kDefaultFlutterKeyEvent = {};

// A wrap to convert FlutterKeyEvent to a ObjC class.
@interface KeyEventWrapper : NSObject
@property(nonatomic) FlutterKeyEvent* data;
Expand Down Expand Up @@ -339,7 +342,7 @@ - (bool)testKeyEventsAreSentToFramework:(id)engineMock {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
Expand Down Expand Up @@ -375,7 +378,7 @@ - (bool)testKeyEventsAreSentToFramework:(id)engineMock {
- (bool)testCtrlTabKeyEventIsPropagated:(id)engineMock {
__block bool called = false;
__block FlutterKeyEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {
Expand Down Expand Up @@ -419,7 +422,7 @@ - (bool)testCtrlTabKeyEventIsPropagated:(id)engineMock {
- (bool)testKeyEquivalentIsPassedToTextInputPlugin:(id)engineMock {
__block bool called = false;
__block FlutterKeyEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {
Expand Down Expand Up @@ -471,7 +474,7 @@ - (bool)testKeyEventsArePropagatedIfNotHandled:(id)engineMock {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
Expand Down Expand Up @@ -545,7 +548,7 @@ - (bool)testFlagsChangedEventsArePropagatedIfNotHandled:(id)engineMock {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
Expand Down Expand Up @@ -598,7 +601,7 @@ - (bool)testKeyEventsAreNotPropagatedIfHandled:(id)engineMock {
OCMStub( // NOLINT(google-objc-avoid-throwing-exception)
[engineMock binaryMessenger])
.andReturn(binaryMessengerMock);
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andCall([FlutterViewControllerTestObjC class],
Expand Down Expand Up @@ -655,7 +658,7 @@ - (bool)testKeyboardIsRestartedOnEngineRestart:(id)engineMock {
.andReturn(binaryMessengerMock);
__block bool called = false;
__block FlutterKeyEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {
Expand Down Expand Up @@ -715,7 +718,7 @@ - (bool)testTrackpadGesturesAreSentToFramework:(id)engineMock {
OCMStub([engineMock renderer]).andReturn(renderer_);
__block bool called = false;
__block FlutterPointerEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:FlutterPointerEvent{}])
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:kDefaultFlutterPointerEvent])
.andDo((^(NSInvocation* invocation) {
FlutterPointerEvent* event;
[invocation getArgument:&event atIndex:2];
Expand Down Expand Up @@ -1139,7 +1142,7 @@ - (bool)testModifierKeysAreSynthesizedOnMouseMove:(id)engineMock {

// Capture calls to sendKeyEvent
__block NSMutableArray<KeyEventWrapper*>* events = [NSMutableArray array];
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:FlutterKeyEvent {}
OCMStub([[engineMock ignoringNonObjectArgs] sendKeyEvent:kDefaultFlutterKeyEvent
callback:nil
userData:nil])
.andDo((^(NSInvocation* invocation) {
Expand Down
Loading