From e0f9865aa209bec93a2e4e9997a91b6aea43cc8d Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Wed, 11 Aug 2021 10:38:06 -0700 Subject: [PATCH 1/4] 'Update Dart SDK to efcdca04aac66e37d579d179866189385e63cd9a' --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 40723ee18f065..082cac62dec96 100644 --- a/DEPS +++ b/DEPS @@ -35,7 +35,7 @@ vars = { # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS. # You can use //tools/dart/create_updated_flutter_deps.py to produce # updated revision list of existing dependencies. - 'dart_revision': '96fdaff98f48235b163278939c6d454caed5170c', + 'dart_revision': 'efcdca04aac66e37d579d179866189385e63cd9a', # WARNING: DO NOT EDIT MANUALLY # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py From 1b279b0de16c1ad31f0b00569accc99fdaaebc6c Mon Sep 17 00:00:00 2001 From: Tong Mu Date: Mon, 9 Aug 2021 15:03:14 -0700 Subject: [PATCH 2/4] Fix: modifier keys not recognized on macOS Web (#27972) --- lib/web_ui/lib/src/engine/keyboard.dart | 2 ++ lib/web_ui/test/keyboard_test.dart | 38 +++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/lib/web_ui/lib/src/engine/keyboard.dart b/lib/web_ui/lib/src/engine/keyboard.dart index 74779355e0d05..ee70681253add 100644 --- a/lib/web_ui/lib/src/engine/keyboard.dart +++ b/lib/web_ui/lib/src/engine/keyboard.dart @@ -128,6 +128,7 @@ class Keyboard { 'keymap': 'web', 'code': keyboardEvent.code, 'key': keyboardEvent.key, + 'location': keyboardEvent.location, 'metaState': _lastMetaState, }; @@ -151,6 +152,7 @@ class Keyboard { 'keymap': 'web', 'code': event.code, 'key': event.key, + 'location': event.location, 'metaState': _lastMetaState, }; diff --git a/lib/web_ui/test/keyboard_test.dart b/lib/web_ui/test/keyboard_test.dart index e08ee22219954..5d1adcb38c533 100644 --- a/lib/web_ui/test/keyboard_test.dart +++ b/lib/web_ui/test/keyboard_test.dart @@ -61,6 +61,7 @@ void testMain() { 'type': 'keyup', 'keymap': 'web', 'code': 'SomeCode', + 'location': 0, 'key': 'SomeKey', 'metaState': 0x0, }); @@ -92,6 +93,7 @@ void testMain() { 'keymap': 'web', 'code': 'SomeCode', 'key': 'SomeKey', + 'location': 0, 'metaState': 0x0, }); expect(event.defaultPrevented, isFalse); @@ -124,6 +126,7 @@ void testMain() { 'keymap': 'web', 'code': 'SomeCode', 'key': 'SomeKey', + 'location': 0, // ctrl 'metaState': 0x4, }); @@ -142,6 +145,7 @@ void testMain() { 'keymap': 'web', 'code': 'SomeCode', 'key': 'SomeKey', + 'location': 0, // shift alt meta 'metaState': 0x1 | 0x2 | 0x8, }); @@ -191,6 +195,7 @@ void testMain() { 'keymap': 'web', 'code': 'SomeCode', 'key': 'SomeKey', + 'location': 0, 'metaState': 0, }; expect(messages, >[ @@ -346,12 +351,14 @@ void testMain() { 'keydown', key: 'Meta', code: 'MetaLeft', + location: 1, isMetaPressed: true, ); dispatchKeyboardEvent( 'keydown', key: 'Alt', code: 'AltLeft', + location: 1, isMetaPressed: true, isAltPressed: true, ); @@ -367,9 +374,15 @@ void testMain() { 'keyup', key: 'Meta', code: 'MetaLeft', + location: 1, isAltPressed: true, ); - dispatchKeyboardEvent('keyup', key: 'Alt', code: 'AltLeft'); + dispatchKeyboardEvent( + 'keyup', + key: 'Alt', + code: 'AltLeft', + location: 1, + ); // Notice no `keyup` for "i". expect(messages, >[ @@ -378,6 +391,7 @@ void testMain() { 'keymap': 'web', 'key': 'Meta', 'code': 'MetaLeft', + 'location': 1, // meta 'metaState': 0x8, }, @@ -386,6 +400,7 @@ void testMain() { 'keymap': 'web', 'key': 'Alt', 'code': 'AltLeft', + 'location': 1, // alt meta 'metaState': 0x2 | 0x8, }, @@ -394,6 +409,7 @@ void testMain() { 'keymap': 'web', 'key': 'i', 'code': 'KeyI', + 'location': 0, // alt meta 'metaState': 0x2 | 0x8, }, @@ -402,6 +418,7 @@ void testMain() { 'keymap': 'web', 'key': 'Meta', 'code': 'MetaLeft', + 'location': 1, // alt 'metaState': 0x2, }, @@ -410,6 +427,7 @@ void testMain() { 'keymap': 'web', 'key': 'Alt', 'code': 'AltLeft', + 'location': 1, 'metaState': 0x0, }, ]); @@ -426,6 +444,7 @@ void testMain() { 'keymap': 'web', 'key': 'i', 'code': 'KeyI', + 'location': 0, 'metaState': 0x0, } ]); @@ -449,12 +468,14 @@ void testMain() { 'keydown', key: 'Meta', code: 'MetaLeft', + location: 1, isMetaPressed: true, ); dispatchKeyboardEvent( 'keydown', key: 'Alt', code: 'AltLeft', + location: 1, isMetaPressed: true, isAltPressed: true, ); @@ -470,9 +491,15 @@ void testMain() { 'keyup', key: 'Meta', code: 'MetaLeft', + location: 1, isAltPressed: true, ); - dispatchKeyboardEvent('keyup', key: 'Alt', code: 'AltLeft'); + dispatchKeyboardEvent( + 'keyup', + key: 'Alt', + code: 'AltLeft', + location: 1, + ); // Notice no `keyup` for "i". messages.clear(); @@ -497,6 +524,7 @@ void testMain() { 'keymap': 'web', 'key': 'i', 'code': 'KeyI', + 'location': 0, 'metaState': 0x0, }); } @@ -551,12 +579,14 @@ void testMain() { 'keydown', key: 'Meta', code: 'MetaLeft', + location: 1, isMetaPressed: true, ); dispatchKeyboardEvent( 'keydown', key: 'Alt', code: 'AltLeft', + location: 1, isMetaPressed: true, isAltPressed: true, ); @@ -572,6 +602,7 @@ void testMain() { 'keyup', key: 'Meta', code: 'MetaLeft', + location: 1, isAltPressed: true, ); // Notice no `keyup` for "AltLeft" and "i". @@ -587,6 +618,7 @@ void testMain() { 'keymap': 'web', 'key': 'i', 'code': 'KeyI', + 'location': 0, // alt 'metaState': 0x2, } @@ -616,6 +648,7 @@ html.KeyboardEvent dispatchKeyboardEvent( html.EventTarget? target, String? key, String? code, + int location = 0, bool repeat = false, bool isShiftPressed = false, bool isAltPressed = false, @@ -631,6 +664,7 @@ html.KeyboardEvent dispatchKeyboardEvent( { 'key': key, 'code': code, + 'location': location, 'repeat': repeat, 'shiftKey': isShiftPressed, 'altKey': isAltPressed, From 1eb435ca35293be3571d08a384f931d5952f7f3c Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Wed, 11 Aug 2021 10:51:04 -0700 Subject: [PATCH 3/4] Cherrypick .ci.yaml updates --- .ci.yaml | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 29f27dbfb4f08..d6f49d7ea74a7 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -10,6 +10,7 @@ enabled_branches: - dev - beta - stable + - flutter-2.5-candidate.5 platform_properties: linux: @@ -57,7 +58,6 @@ platform_properties: targets: - name: Linux Android AOT Engine - builder: Linux Android AOT Engine recipe: engine properties: add_recipes_cq: "true" @@ -68,7 +68,6 @@ targets: scheduler: luci - name: Linux Android Debug Engine - builder: Linux Android Debug Engine recipe: engine properties: add_recipes_cq: "true" @@ -81,7 +80,6 @@ targets: scheduler: luci - name: Linux Android Scenarios - builder: Linux Android Scenarios bringup: true # Recipe issue https://github.com/flutter/flutter/issues/86427 recipe: engine/scenarios properties: @@ -91,7 +89,6 @@ targets: scheduler: luci - name: Linux Benchmarks - builder: Linux Benchmarks enabled_branches: - master recipe: engine/engine_metrics @@ -102,7 +99,6 @@ targets: scheduler: luci - name: Linux Fuchsia - builder: Linux Fuchsia recipe: engine properties: add_recipes_cq: "true" @@ -112,7 +108,6 @@ targets: scheduler: luci - name: Linux Fuchsia FEMU - builder: Linux Fuchsia FEMU recipe: femu_test properties: add_recipes_cq: "true" @@ -122,13 +117,11 @@ targets: scheduler: luci - name: Linux Framework Smoke Tests - builder: Linux Framework Smoke Tests recipe: engine/framework_smoke timeout: 60 scheduler: luci - name: Linux Host Engine - builder: Linux Host Engine recipe: engine properties: add_recipes_cq: "true" @@ -137,7 +130,6 @@ targets: scheduler: luci - name: Linux Unopt - builder: Linux Unopt recipe: engine_unopt properties: add_recipes_cq: "true" @@ -145,7 +137,6 @@ targets: scheduler: luci - name: Linux Arm Host Engine - builder: Linux Arm Host Engine recipe: engine/engine_arm properties: add_recipes_cq: "true" @@ -154,7 +145,6 @@ targets: scheduler: luci - name: Linux Web Engine - builder: Linux Web Engine recipe: web_engine properties: add_recipes_cq: "true" @@ -170,7 +160,6 @@ targets: - flutter_frontend_server/** - name: Linux Web Framework tests - builder: Linux Web Framework tests recipe: engine/web_engine_framework properties: add_recipes_cq: "true" @@ -189,7 +178,6 @@ targets: - flutter_frontend_server/** - name: Mac Android AOT Engine - builder: Mac Android AOT Engine recipe: engine properties: android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee @@ -198,18 +186,7 @@ targets: timeout: 60 scheduler: luci - - name: Mac Android Debug Engine - builder: Mac Android Debug Engine - recipe: engine - properties: - android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee - android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd - build_android_debug: "true" - timeout: 60 - scheduler: luci - - name: Mac Host Engine - builder: Mac Host Engine recipe: engine properties: add_recipes_cq: "true" @@ -218,7 +195,6 @@ targets: scheduler: luci - name: Mac Unopt - builder: Mac Unopt recipe: engine_unopt properties: add_recipes_cq: "true" @@ -227,7 +203,6 @@ targets: scheduler: luci - name: Mac iOS Engine - builder: Mac iOS Engine recipe: engine properties: build_ios: "true" @@ -237,7 +212,6 @@ targets: scheduler: luci - name: Mac Web Engine - builder: Mac Web Engine recipe: web_engine properties: gcs_goldens_bucket: flutter_logs @@ -252,7 +226,6 @@ targets: - flutter_frontend_server/** - name: Windows Android AOT Engine - builder: Windows Android AOT Engine recipe: engine properties: build_android_aot: "true" @@ -262,7 +235,6 @@ targets: scheduler: luci - name: Windows Host Engine - builder: Windows Host Engine recipe: engine timeout: 60 properties: @@ -271,7 +243,6 @@ targets: scheduler: luci - name: Windows Unopt - builder: Windows Unopt recipe: engine_unopt properties: add_recipes_cq: "true" @@ -279,7 +250,6 @@ targets: scheduler: luci - name: Windows UWP Engine - builder: Windows UWP Engine recipe: engine properties: build_windows_uwp: "true" @@ -287,7 +257,6 @@ targets: scheduler: luci - name: Windows Web Engine - builder: Windows Web Engine recipe: web_engine properties: gcs_goldens_bucket: flutter_logs @@ -299,7 +268,6 @@ targets: - web_sdk/** - name: Mac iOS Engine Profile - builder: Mac iOS Engine Profile presubmit: false recipe: engine properties: @@ -310,7 +278,6 @@ targets: scheduler: luci - name: Mac iOS Engine Release - builder: Mac iOS Engine Release presubmit: false recipe: engine properties: @@ -321,7 +288,6 @@ targets: scheduler: luci - name: Linux ci_yaml engine roller - builder: Linux ci_yaml engine roller bringup: true presubmit: false recipe: infra/ci_yaml From d964d4560ff2b73213a70f6cd8b1bb9aca39ced1 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Wed, 11 Aug 2021 11:22:24 -0700 Subject: [PATCH 4/4] update licenses golden --- ci/licenses_golden/licenses_third_party | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party index 70fd4a0ba1eb1..2e865d849aab7 100644 --- a/ci/licenses_golden/licenses_third_party +++ b/ci/licenses_golden/licenses_third_party @@ -1,4 +1,4 @@ -Signature: 13fa760c99e240d0330dbcd4a9c43357 +Signature: 0e17a8bd44a6b7e8370697373939f62c UNUSED LICENSES: