Merge branch 'flutter:main' into pipeline_future

Author: ColdPaleLight

.ci.yaml

@@ -268,6 +268,8 @@ targets:
       add_recipes_cq: "true"
       cores: "32"
       gcs_goldens_bucket: flutter_logs
+      gclient_custom_vars: >-
+        {"download_emsdk": true}
       dependencies: >-
         [
           {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
@@ -407,6 +409,8 @@ targets:
     properties:
       add_recipes_cq: "true"
       gcs_goldens_bucket: flutter_logs
+      gclient_custom_vars: >-
+        {"download_emsdk": true}
       dependencies: >-
         [
           {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
@@ -463,13 +467,15 @@ targets:
     bringup: true
     timeout: 60
     properties:
+      release_build: "true"
       config_name: windows_android_aot_engine
 
   - name: Windows windows_host_engine
     recipe: engine_v2/engine_v2
     bringup: true
     timeout: 60
     properties:
+      release_build: "true"
       config_name: windows_host_engine
 
   - name: Windows Unopt
@@ -481,6 +487,8 @@ targets:
   - name: Windows Web Engine
     recipe: engine/web_engine
     properties:
+      gclient_custom_vars: >-
+        {"download_emsdk": true}
       gcs_goldens_bucket: flutter_logs
     timeout: 60
     runIf:

DEPS

@@ -18,7 +18,7 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': '513f0fd34590eb65c079b0bd4fe82b680ab798c1',
+  'skia_revision': '8b19fb0f57d47fd217add26a5eb3e430d7a0d473',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -48,7 +48,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': 'd97d5ad9889378e70f9803f8bf1ba3e0781ab1b8',
+  'dart_revision': 'b22b36c0f52ef7068f321ac1266f286745b65de0',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -59,7 +59,7 @@ vars = {
   'dart_collection_rev': 'efd709fc1760a595f8575f4137a1847de1b49d76',
   'dart_devtools_rev': '23444af89d716818f099974df3e4fffac87fd886',
   'dart_protobuf_rev': 'ba29983968de5b54196c6c2a5cff1afbdda24ae2',
-  'dart_pub_rev': '6506cc01b1bd17aff782037817d86a88a1c312e8',
+  'dart_pub_rev': '65c7f3e528f3f9978c4330cbd471070f17370f65',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
   'dart_webdev_rev': '069b87091b0cd25ae1a5e5927cdf6a475fda5bf7',
@@ -118,7 +118,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '4099e11fffa406aaa13be8bd512fe5b0ad6262f6',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd13d64086f5e301bd0415eede895b34af220ef42',
 
    # Fuchsia compatibility
    #
@@ -255,7 +255,7 @@ deps = {
    Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@f3873403f5b1a0319f78632a8fbc2b22315a7b83',
+   Var('dart_git') + '/markdown.git@9ff4a9f1d37c763f827084ba28a3d0bfec6b5d67',
 
   'src/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@6a9b83bbd73e50df2058b3e8e4aa301df49569c6',
@@ -686,7 +686,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': '5XOj9l5e2wkSpMKT1pLJGtq9_UAQkHV13y-kg9rVNiUC'
+        'version': 'sa5bVGimNo3JwLV27Wpu8RLzitWUvIeqJtAqcrtplosC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: 4cfa83d4b64ec67ed40c288fbd614591
+Signature: 7140d8ef2695ea07f4bc05d55aab7947
 
 UNUSED LICENSES:
 
@@ -611,6 +611,7 @@ FILE: ../../../third_party/skia/experimental/wasm-hello-world/BUILD.bazel
 FILE: ../../../third_party/skia/experimental/wasm-hello-world/hello_world.html
 FILE: ../../../third_party/skia/experimental/webgpu-bazel/example/index.html
 FILE: ../../../third_party/skia/experimental/webgpu-bazel/src/BUILD.bazel
+FILE: ../../../third_party/skia/gn/BUILD.bazel
 FILE: ../../../third_party/skia/go.mod
 FILE: ../../../third_party/skia/go.sum
 FILE: ../../../third_party/skia/go_repositories.bzl

ci/licenses_golden/licenses_third_party

@@ -1,4 +1,4 @@
-Signature: e9f20361a5fb96f8af457ee0112f23cd
+Signature: 29ec7dd59754e16658570708295646c7
 
 UNUSED LICENSES:
 
@@ -14113,6 +14113,7 @@ FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/string_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/symbol_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/timer_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/type.dart
+FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/typed_data_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/_internal/wasm/lib/uri_patch.dart
 FILE: ../../../third_party/dart/sdk/lib/core/record.dart
 FILE: ../../../third_party/dart/sdk/lib/ffi/c_type.dart

ci/lint.sh

@@ -36,6 +36,15 @@ DART="${DART_BIN}/dart"
 # to have this as an error.
 MAC_HOST_WARNINGS_AS_ERRORS="performance-move-const-arg,performance-unnecessary-value-param"
 
+# FLUTTER_LINT_PRINT_FIX will make it so that fix is executed and the generated
+# diff is printed to stdout if clang-tidy fails. This is helpful for enabling
+# new lints.
+if [[ -z "${FLUTTER_LINT_PRINT_FIX}" ]]; then
+  fix_flag=""
+else
+  fix_flag="--fix"
+fi
+
 COMPILE_COMMANDS="$SRC_DIR/out/host_debug/compile_commands.json"
 if [ ! -f "$COMPILE_COMMANDS" ]; then
   (cd "$SRC_DIR"; ./flutter/tools/gn)
@@ -49,7 +58,18 @@ cd "$SCRIPT_DIR"
   "$SRC_DIR/flutter/tools/clang_tidy/bin/main.dart" \
   --src-dir="$SRC_DIR" \
   --mac-host-warnings-as-errors="$MAC_HOST_WARNINGS_AS_ERRORS" \
-  "$@"
+  $fix_flag \
+  "$@" && true # errors ignored
+clang_tidy_return=$?
+if [ $clang_tidy_return -ne 0 ]; then
+  if [ -n "$fix_flag" ]; then
+    echo "###################################################"
+    echo "# Attempted to fix issues with the following patch:"
+    echo "###################################################"
+    git --no-pager diff
+  fi
+  exit $clang_tidy_return
+fi
 
 echo "$(date +%T) Running pylint"
 

display_list/display_list_image_filter_unittests.cc

@@ -810,8 +810,11 @@ TEST(DisplayListImageFilter, LocalImageFilterBounds) {
         auto sk_local_filter = sk_filters[i]->makeWithLocalMatrix(m);
         auto dl_local_filter = dl_filters[i]->makeWithLocalMatrix(m);
         if (!sk_local_filter || !dl_local_filter) {
-          ASSERT_TRUE(!sk_local_filter);
-          ASSERT_TRUE(!dl_local_filter);
+          // Temporarily relax the equivalence testing to allow Skia to expand
+          // their behavior. Once the Skia fixes are rolled in, the
+          // DlImageFilter should adapt  to the new rules.
+          // See https://github.com/flutter/flutter/issues/114723
+          ASSERT_TRUE(sk_local_filter || !dl_local_filter);
           continue;
         }
         {

lib/ui/platform_dispatcher.dart

@@ -750,6 +750,27 @@ class PlatformDispatcher {
     _invoke(onAccessibilityFeaturesChanged, _onAccessibilityFeaturesChangedZone,);
   }
 
+  /// Change the retained semantics data about this platform dispatcher.
+  ///
+  /// If [semanticsEnabled] is true, the user has requested that this function
+  /// be called whenever the semantic content of this platform dispatcher
+  /// changes.
+  ///
+  /// In either case, this function disposes the given update, which means the
+  /// semantics update cannot be used further.
+  @Deprecated('''
+    In a multi-view world, the platform dispatcher can no longer provide apis
+    to update semantics since each view will host its own semantics tree.
+
+    Semantics updates must be passed to an individual [FlutterView]. To update
+    semantics, use PlatformDispatcher.instance.views to get a [FlutterView] and
+    call `updateSemantics`.
+  ''')
+  void updateSemantics(SemanticsUpdate update) => _updateSemantics(update);
+
+  @FfiNative<Void Function(Pointer<Void>)>('PlatformConfigurationNativeApi::UpdateSemantics')
+  external static void _updateSemantics(SemanticsUpdate update);
+
   /// The system-reported default locale of the device.
   ///
   /// This establishes the language and formatting conventions that application

lib/web_ui/lib/platform_dispatcher.dart

@@ -83,6 +83,14 @@ abstract class PlatformDispatcher {
   VoidCallback? get onAccessibilityFeaturesChanged;
   set onAccessibilityFeaturesChanged(VoidCallback? callback);
 
+  @Deprecated('''
+    In a multi-view world, the platform dispatcher can no longer provide apis
+    to update semantics since each view will host its own semantics tree.
+
+    Semantics updates must be passed to an individual [FlutterView]. To update
+    semantics, use PlatformDispatcher.instance.views to get a [FlutterView] and
+    call `updateSemantics`.
+  ''')
   void updateSemantics(SemanticsUpdate update);
 
   Locale get locale;

lib/web_ui/lib/src/engine/key_map.g.dart

@@ -574,6 +574,7 @@ const Map<String, List<int?>> kWebLogicalLocationMap = <String, List<int?>>{
   '8': <int?>[0x00000000038, null, null, 0x00200000238], // digit8, null, null, numpad8
   '9': <int?>[0x00000000039, null, null, 0x00200000239], // digit9, null, null, numpad9
   'Alt': <int?>[0x00200000104, 0x00200000104, 0x00200000105, null], // altLeft, altLeft, altRight, null
+  'AltGraph': <int?>[0x00100000103, null, 0x00100000103, null], // altGraph, null, altGraph, null
   'ArrowDown': <int?>[0x00100000301, null, null, 0x00200000232], // arrowDown, null, null, numpad2
   'ArrowLeft': <int?>[0x00100000302, null, null, 0x00200000234], // arrowLeft, null, null, numpad4
   'ArrowRight': <int?>[0x00100000303, null, null, 0x00200000236], // arrowRight, null, null, numpad6

lib/web_ui/lib/src/engine/keyboard_binding.dart

@@ -584,31 +584,27 @@ class KeyboardConverter {
       _kPhysicalAltLeft,
       _kPhysicalAltRight,
       _kLogicalAltLeft,
-      _kLogicalAltRight,
       altPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
       eventTimestamp,
     );
     _synthesizeModifierIfNeeded(
       _kPhysicalControlLeft,
       _kPhysicalControlRight,
       _kLogicalControlLeft,
-      _kLogicalControlRight,
       controlPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
       eventTimestamp,
     );
     _synthesizeModifierIfNeeded(
       _kPhysicalMetaLeft,
       _kPhysicalMetaRight,
       _kLogicalMetaLeft,
-      _kLogicalMetaRight,
       metaPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
       eventTimestamp,
     );
     _synthesizeModifierIfNeeded(
       _kPhysicalShiftLeft,
       _kPhysicalShiftRight,
       _kLogicalShiftLeft,
-      _kLogicalShiftRight,
       shiftPressed ? ui.KeyEventType.down : ui.KeyEventType.up,
       eventTimestamp,
     );
@@ -618,7 +614,6 @@ class KeyboardConverter {
     int physicalLeft,
     int physicalRight,
     int logicalLeft,
-    int logicalRight,
     ui.KeyEventType type,
     num domTimestamp,
   ) {
@@ -635,12 +630,14 @@ class KeyboardConverter {
 
     // Synthesize an up event for left key if pressed
     if (synthesizeUp && leftPressed) {
-      _synthesizeKeyUpEvent(domTimestamp, physicalLeft, logicalLeft);
+      final int knownLogicalKey = _pressingRecords[physicalLeft]!;
+      _synthesizeKeyUpEvent(domTimestamp, physicalLeft, knownLogicalKey);
     }
 
     // Synthesize an up event for right key if pressed
     if (synthesizeUp && rightPressed) {
-      _synthesizeKeyUpEvent(domTimestamp, physicalRight, logicalRight);
+      final int knownLogicalKey = _pressingRecords[physicalRight]!;
+      _synthesizeKeyUpEvent(domTimestamp, physicalRight, knownLogicalKey);
     }
   }