Merge branch 'main' into disablable-context-menu

.ci.yaml

@@ -8,7 +8,7 @@
 enabled_branches:
   - main
   - flutter-\d+\.\d+-candidate\.\d+
-  - fuchsia_r\d+
+  - fuchsia_r\d+[a-z]*
 
 platform_properties:
   linux:
@@ -510,6 +510,14 @@ targets:
       release_build: "true"
       config_name: windows_host_engine
 
+  - name: Windows windows_arm_host_engine
+    bringup: true
+    recipe: engine_v2/engine_v2
+    timeout: 60
+    properties:
+      release_build: "true"
+      config_name: windows_arm_host_engine
+
   - name: Windows Unopt
     recipe: engine/engine_unopt
     properties:

.github/workflows/scorecards-analysis.yml

@@ -15,11 +15,11 @@ jobs:
     if: ${{ github.repository == 'flutter/engine' }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         with:
           persist-credentials: false
       - name: "setup python"
-        uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: '3.7.7' # install the python version needed
       - name: "execute py script"
@@ -38,7 +38,7 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         with:
           persist-credentials: false
       - name: "Run analysis"
@@ -57,14 +57,14 @@ jobs:
 
       # Upload the results as artifacts (optional).
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
+        uses: github/codeql-action/upload-sarif@515828d97454b8354517688ddc5b48402b723750
         with:
           sarif_file: results.sarif

.github/workflows/third_party_scan.yml

@@ -22,12 +22,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
         with:
           persist-credentials: false
 
       - name: setup python
-        uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912
+        uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435
         with:
           python-version: '3.7.7' # install the python version needed
 
@@ -43,14 +43,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
+        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce
         with:
           name: SARIF file
           path: osvReport.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394
+        uses: github/codeql-action/upload-sarif@515828d97454b8354517688ddc5b48402b723750
         with:
           sarif_file: osvReport.sarif

DEPS

@@ -18,11 +18,11 @@ 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': '60e4a4a27375459b65ae83bf73234c55a048c15a',
+  'skia_revision': '8ea9b39f7213ba38411f39437018a0deffd9bcbb',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
-  'canvaskit_cipd_instance': 'ztaLvbs5GPmlAwUosC7VVp7EQnNVknRpNuKdv7vmzaAC',
+  'canvaskit_cipd_instance': '61aeJQ9laGfEFF_Vlc_u0MCkqB6xb2hAYHRBxKH-Uw4C',
 
   # Do not download the Emscripten SDK by default.
   # This prevents us from downloading the Emscripten toolchain for builds
@@ -48,23 +48,23 @@ 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': '0b064bc49557bebc394aff357105487fb55d3158',
+  'dart_revision': '0097dcbada06953a0831a54b2980ddd5e8d57aef',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
-  'dart_binaryen_rev': '12ad604c17407f6b36d52c6404f2dab32e5c7960',
+  'dart_binaryen_rev': '36e2abbcdd22b2b1707757b49fb4ac8844f28e5d',
   'dart_boringssl_gen_rev': 'ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f',
   'dart_boringssl_rev': '87f316d7748268eb56f2dc147bd593254ae93198',
-  'dart_browser_launcher_rev': '2712dda4bb7eb5304fcf535b57e19b855491533e',
-  'dart_clock_rev': '8a8231fa7912d84c7e99236b7800cfbef5ea7ae5',
+  'dart_browser_launcher_rev': 'f2f01e4c7e719c633ca3c35d55c5331d4fe8b54b',
+  'dart_clock_rev': '65e8a13ddf26c9d21884ccc8f8532725697d40df',
   'dart_collection_rev': '85e987cf1b8aaba60bdc8b16dd1ee6233436549f',
   'dart_devtools_rev': 'dd3fade2bd2ef74fc6102e56333a48f0efc594d3',
-  'dart_protobuf_rev': '1d1c92accb22157de86d162564409384f07af079',
-  'dart_pub_rev': 'eb8ee21a089ebe0f2c2dd89802d63e51cb62f8b6',
+  'dart_protobuf_rev': 'dd04535271a25fd6f11ccaf09bca18d968538420',
+  'dart_pub_rev': '0cbaf7a2fb8c8ca543c6f222bf25d5f5c63abbf3',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
-  'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
-  'dart_webdev_rev': '8795ca5b89df0f912e31b0f5fa372b90f2a0bf66',
-  'dart_webkit_inspection_protocol_rev': 'ddb624cd85954dd384056cc253a8fc2b9da5364d',
+  'dart_watcher_rev': '3b49c7ea087cc158bdcba19fe8919283fdc1cd86',
+  'dart_webdev_rev': '094ee97b59048d64d5519e6c9e8072cc1bf914dc',
+  'dart_webkit_inspection_protocol_rev': '15244ffbab9221f1603eb04eaae74ae7c7ca3944',
   'dart_yaml_edit_rev': '299f74594ff9fda412c1da5c0b5d5231d0c6fc42',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
 
@@ -298,7 +298,7 @@ deps = {
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
   'src/third_party/dart/third_party/binaryen/src':
-   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@12ad604c17407f6b36d52c6404f2dab32e5c7960',
+   Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@36e2abbcdd22b2b1707757b49fb4ac8844f28e5d',
 
   'src/third_party/dart/third_party/devtools':
    {'packages': [{'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
@@ -310,16 +310,16 @@ deps = {
    Var('dart_git') + '/async.git@de1ce93c6f58c22fda4dd4d6267ecebebed622c3',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
-   Var('dart_git') + '/bazel_worker.git@9f21e1de12d1f7e7450e70b314c81631526c22d0',
+   Var('dart_git') + '/bazel_worker.git@b35c25e6cecced319b80c6686b9d025e462c7053',
 
   'src/third_party/dart/third_party/pkg/boolean_selector':
-   Var('dart_git') + '/boolean_selector.git@5082b3debf97421c071be957063763d98412b2e2',
+   Var('dart_git') + '/boolean_selector.git@ba7d86b66382aa808576cd55840d4c34f0225066',
 
   'src/third_party/dart/third_party/pkg/browser_launcher':
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@5a8e8ee28560e0f3813795838c194a3f561ffb82',
+   Var('dart_git') + '/cli_util.git@32bc0779a604c1bde1bb0782789c99cac222e651',
 
   'src/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -331,16 +331,16 @@ deps = {
    Var('dart_git') + '/convert.git@20d136c2fa4edc229fc3d7684bbeb8df5105580b',
 
   'src/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@bf0c33b42eb7e5991ee98429318884695e576c2b',
+   Var('dart_git') + '/crypto.git@f854f2fa730acb107aa41ebe431403081f7161e4',
 
   'src/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@34203c09f073ed8267f5d6e333daddb02e6ff609',
+   Var('dart_git') + '/csslib.git@7054945b62bd83c4c7a0fab693fa73c3f137c202',
 
   'src/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@d0c6b1da52c9f80679a7aaa05e5935ef5c6bb52f',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@ce255246f2e4f29539730e11a2a43767ec615668',
+   Var('dart_git') + '/dartdoc.git@c4ab68247fd40071bc7303c61fc180a57ab086df',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@2a56c2a9a87122c057168874bde384debbb806b0',
@@ -349,34 +349,34 @@ deps = {
    Var('dart_git') + '/external/github.com/google/file.dart@b768f79dcd104a5feabafab47101c4355b71cd8f',
 
   'src/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@714381c6b1d1fe57e87824e3f13a9c752eee48ea',
+   Var('dart_git') + '/fixnum.git@71f0d4d16054e6be7d8e22bdb3b082b9f82061be',
 
   'src/third_party/dart/third_party/pkg/glob':
-   Var('dart_git') + '/glob.git@7adf833312d87c2786a792d672ddd116f09b249e',
+   Var('dart_git') + '/glob.git@4579281741e59e2e4ad02a197e0b1f4d6558dede',
 
   'src/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@28fb8b97acf471bedcfa4eaf38899a0f65d5e30d',
+   Var('dart_git') + '/html.git@3dd00b0ca99e222697e6b6dc653774dc877da420',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@38d5dd9bb4dd2b2a581083612f9edb216d2fadb3',
+   Var('dart_git') + '/http.git@d434d42b4c0a75fb3f4170899e9a30265487fbba',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@e31c6988e3869fb4019429254604066338f86095',
+   Var('dart_git') + '/http_multi_server.git@cce50802b66d33f703f82b3189988aa8e51976ac',
 
   'src/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@16a4f34aed27a3eb91c3526827e76fc28ed469d6',
+   Var('dart_git') + '/http_parser.git@6f73e4a399df013ded8f4c81f151d122b36d361b',
 
   'src/third_party/dart/third_party/pkg/intl':
-   Var('dart_git') + '/intl.git@59e7bff7cd6ad5152dd71eec92d97cd8ebeb3f6d',
+   Var('dart_git') + '/intl.git@c61fdd19c5a1a72b60d58152e2860f08725d188b',
 
   'src/third_party/dart/third_party/pkg/json_rpc_2':
    Var('dart_git') + '/json_rpc_2.git@bd9f8d90ec9ce9d0da5c11f3e71b87af3aaca3b4',
 
   'src/third_party/dart/third_party/pkg/linter':
-   Var('dart_git') + '/linter.git@79b843349deaea4a2455cfa37cc47cbc0e472190',
+   Var('dart_git') + '/linter.git@8f7b75f8a3501ca2c4d5bbc1f003d90d66447544',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@b525d5c39c8ae6f0826c63a371d286080e2ec93e',
+   Var('dart_git') + '/logging.git@34ed68fe23291c82bb685984e4e2ffc06860a4a8',
 
   'src/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@ee3f4e976efcfed87c6ec78364bc2dd3c6e717b9',
@@ -388,16 +388,16 @@ deps = {
    Var('dart_git') + '/mime.git@273d454711487fe00849c2bf3dff189278fd0e6f',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@942dd037a2f0f0203e1f367d4a5693e7617b0c9b',
+   Var('dart_git') + '/mockito.git@9cc958a991dc6d6b563196893a77973eee58603c',
 
   'src/third_party/dart/third_party/pkg/package_config':
-   Var('dart_git') + '/package_config.git@abb4aec904ab8c739b6dcec516d44f56d96c8115',
+   Var('dart_git') + '/package_config.git@2e1a8eca1ebeac01f45003642c25e24e63d45b50',
 
   'src/third_party/dart/third_party/pkg/path':
-   Var('dart_git') + '/path.git@1299791bb4363af47ec6e32f599a5c3d168e320e',
+   Var('dart_git') + '/path.git@9768908ef81cf92fc77cb259c2cf01ca8725de88',
 
   'src/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@1ea5b031cfda37786d305292cb8104dffb45d9ae',
+   Var('dart_git') + '/pool.git@ad4e2a7fde6a2937b2f7f59af271b437376d8e3d',
 
   'src/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -406,43 +406,43 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@17231113f98c80285881cc4452863bcfd085d1a8',
+   Var('dart_git') + '/pub_semver.git@3946e33446365aa6af84abc0b1f47ad3a6f3b490',
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@32e342d2498db739d2d79123cecd8f2e8d598c3b',
+   Var('dart_git') + '/shelf.git@a44e95e00324b6051bbee5ea235355f843795d1c',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
-   Var('dart_git') + '/source_map_stack_trace.git@8d8078fcc81c8f7936805cd277198493e0b7fc62',
+   Var('dart_git') + '/source_map_stack_trace.git@adea3e51269f355514b59b66a4fcecabd1fa6e95',
 
   'src/third_party/dart/third_party/pkg/source_maps':
-   Var('dart_git') + '/source_maps.git@b031e2cdbef5675ab9a92025202d323a5e7cc526',
+   Var('dart_git') + '/source_maps.git@d995912983f4f4c33a040c629952fb4632aeea70',
 
   'src/third_party/dart/third_party/pkg/source_span':
-   Var('dart_git') + '/source_span.git@d1d47e550b6f77ed9b4907339a8a5e430b9ca314',
+   Var('dart_git') + '/source_span.git@72d5c55e455c3940c37fe768730f5922e7a1f309',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@2de27fe69526b1c44772fcc50d62068a8c7f45e6',
+   Var('dart_git') + '/sse.git@be426a2467108d88354dc36a44493d2d17019993',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@cf3562e0bf1796d4a801ed345408fcbc929dea70',
+   Var('dart_git') + '/stack_trace.git@c08ee90b83380381a893d1e77a9a533d632f40e0',
 
   'src/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@914304769d036867b993bd7f9c111145f1ca4ab0',
+   Var('dart_git') + '/stream_channel.git@3b9926876dc06970b583c34d0cb359ef976c4350',
 
   'src/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@6ddab2c6a3374c9b0fe5ba08ff9badce944a797e',
+   Var('dart_git') + '/string_scanner.git@c58618df0f17cbed664b3868c949abb13491e4d3',
 
   'src/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@822cd5b3418615c6db715a796c2c9ba9acb63b0d',
+   Var('dart_git') + '/term_glyph.git@8cd931827bc3bfc1c62fd7ea44cbbc99b8a94f4d',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@8235a25b98be448bca627d58b969de42b8b6633c',
+   Var('dart_git') + '/test.git@932a652bea3f8b95848effb23247acf2bdf35a09',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
-   Var('dart_git') + '/test_reflective_loader.git@52b6753852661787208e003f9716b079026c7ac7',
+   Var('dart_git') + '/test_reflective_loader.git@cf58259b91c4d3cccc90abd4c0b44273e6421646',
 
   'src/third_party/dart/third_party/pkg/typed_data':
-   Var('dart_git') + '/typed_data.git@dbf81a7ce7cdc8ad2695a84cbb5dced77b53af92',
+   Var('dart_git') + '/typed_data.git@9c209b9c99ca7528a45c23d5d09579788b3ea81b',
 
   'src/third_party/dart/third_party/pkg/usage':
    Var('dart_git') + '/usage.git@2773c7d334db9a902582feb8c5f38899c83d7b54',
@@ -451,7 +451,7 @@ deps = {
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
 
   'src/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@a90e740dad4739d578e09eb0e076ac2846f9404e',
+   Var('dart_git') + '/web_socket_channel.git@28d7b82986cf931e6d977d973a7849cfc7c0bab9',
 
   'src/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -460,7 +460,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'src/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@f6992752da8883a4bd9b036063371dca552848cc',
+   Var('dart_git') + '/yaml.git@b2fce6cb8f07f091967b849d5434ed495cbb305f',
 
   'src/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
@@ -614,7 +614,7 @@ deps = {
   Var('dart_git') + '/external/github.com/google/file.dart.git' + '@' + 'b2e31cb6ef40b223701dbfa0b907fe58468484d7', # 6.1.4
 
   'src/third_party/pkg/flutter_packages':
-  Var('github_git') + '/flutter/packages.git' + '@' + '26990a2f75ab2028c3c77ffc869db11d6d866d18', # various
+  Var('github_git') + '/flutter/packages.git' + '@' + '25454e63851fe7933f04d025606e68c1eac4fe0f', # various
 
   'src/third_party/pkg/gcloud':
   Var('github_git') + '/dart-lang/gcloud.git' + '@' + 'a5276b85c4714378e84b1fb478b8feeeb686ac26', # 0.8.6-dev
@@ -816,7 +816,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'Bewt-eq7gNu6sU_ObE3pPFk98TYuoEo_Hb8p-4EBKRcC'
+        'version': 'iwCuzAuMgsk75hlT0VuqllvQps-iowz5WVsCb6a4mh4C'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',

build/archives/BUILD.gn

@@ -227,7 +227,7 @@ if (build_engine_artifacts && !flutter_prebuilt_dart_sdk) {
 # Archives Flutter Windows Artifacts
 if (host_os == "win") {
   zip_bundle("windows_flutter") {
-    output = "$full_platform_name-$flutter_runtime_mode/$full_platform_name-flutter.zip"
+    output = "$full_target_platform_name-$flutter_runtime_mode/$full_target_platform_name-flutter.zip"
     deps = [
       "//flutter/shell/platform/common:publish_headers",
       "//flutter/shell/platform/windows:flutter_windows",