Merge remote-tracking branch 'upstream/main' into engine-mono-worskpa…

…ce-pubspec
flutter · Jul 3, 2024 · ff2aa36 · ff2aa36
2 parents 9f49e49 + c9a6ca0
commit ff2aa36
Show file tree

Hide file tree

Showing 68 changed files with 1,410 additions and 1,295 deletions.
diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml
@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251
+        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/third_party_scan.yml b/.github/workflows/third_party_scan.yml
@@ -41,7 +41,7 @@ jobs:
     name: Vulnerability scanning
     needs:
       extract-deps
-    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.7.4"
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.8.1"
     with:
       # Download the artifact uploaded in extract-deps step
       download-artifact: osv-lockfile-${{github.sha}}

diff --git a/DEPS b/DEPS
@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': '8375bdc6e191da6e39be965969cab4014bfbc8d1',
+  'skia_revision': '86ee8cc615081303f575983bc2eb10e67b17a6ed',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -56,28 +56,28 @@ 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': 'c23e5814379374504ddad4f68c4ded939fcee0a2',
+  'dart_revision': 'ffc8bb004a64f6357e3d5d1185e974e966f00931',
 
   # 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': '654ee6e2504f11fb0e982a2cf276bafa750f694b',
   'dart_boringssl_gen_rev': '9c7294fd58261a79794f5afaa26598cf1442ad20',
   'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
-  'dart_browser_launcher_rev': '7348ceae6508e5350771979c2951a54313303416',
-  'dart_clock_rev': '7cbf08e36a92f14f22132d255846610c1b065324',
+  'dart_browser_launcher_rev': '60126904a26b761d29b4f2d76292ff3c089160de',
+  'dart_clock_rev': 'ad428ea8b75fa0d7ba629791552d40478745c54a',
   'dart_collection_rev': '9354f386de3c57f5486b01ab4dfa1a2f033307d9',
   'dart_devtools_rev': '70375f6c6d81faa8f3069aa6dcf2a98c69445455',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
   'dart_pub_rev': 'ea4a1c854690d3abceb92c8cc2c6454470f9d5a7',
-  'dart_tools_rev': '4c606868746da309963589e99b39d2017c582975',
-  'dart_watcher_rev': 'f312f1f81c5272ad34ed5c40f29ba8599caed3ef',
-  'dart_web_rev': '2ae509e7e733c3e752b9524aded3cfffc6f64a2f',
+  'dart_tools_rev': '43a8582a85d2220b5f1ca8383d97587792085b36',
+  'dart_watcher_rev': '0484625589d8512b36a7ad898a6cc6351d24c556',
+  'dart_web_rev': 'e4c4d8126466e28dc137890b8f999da59bdedddd',
   'dart_webdev_rev': '75417c09181c97786d9539a662834bed9d2f1e77',
-  'dart_webkit_inspection_protocol_rev': '5740cc91eaeb13a02007b77b128fccf4b056db6e',
-  'dart_yaml_edit_rev': 'ad3292cd8e893747fae73a7c552d8c858a2be986',
+  'dart_webkit_inspection_protocol_rev': '32fffa53df3f54005c742ddf4f859fb585a6b254',
+  'dart_yaml_edit_rev': '57a28daea82a3f00f57a90d5ea6df6a458b2f781',
 
   'ocmock_rev': 'c4ec0e3a7a9f56cfdbd0aa01f4f97bb4b75c5ef8', # v3.7.1
 
@@ -255,7 +255,7 @@ vars = {
 
   # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
   # used altogether with fuchsia-sdk to generate gn based build rules.
-  'fuchsia_gn_sdk_version': 'RgErspyYHapUO2SpcW-vo2p8yaRUMUrq0eWjRVPfQjoC',
+  'fuchsia_gn_sdk_version': 'sbh76PYVTMxav4ACTgA-TXWcbZTZcWWjsqATCxrGIvwC',
 }
 
 gclient_gn_args_file = 'src/flutter/third_party/dart/build/config/gclient_args.gni'
@@ -277,7 +277,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '6c01dbca494b78e32f9e4aa704514faabfba74e8',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8c2d66fa4e6298894425f5bdd0591bc5b1154c53',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -307,7 +307,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
   'src/flutter/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '98f2494518c2dbb9c488e83e507b070ea5910e95',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '43953f57b037778a1b8005564afabe214834f7bd',
 
    'src/flutter/third_party/gtest-parallel':
    Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -353,19 +353,19 @@ deps = {
    Var('dart_git') + '/args.git@6a5a2e6b1f0020b873c7ffbdd36a784c4f9ee300',
 
   'src/flutter/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@d7c0cd5a458308ab5e5a0d0deebdce32c4391ec6',
+   Var('dart_git') + '/async.git@c0d81f8699682d01d657a9bf827107d11904a247',
 
   'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
    Var('dart_git') + '/bazel_worker.git@c76d7c86381a6ed594641ba03b55c65b84ee11a6',
 
   'src/flutter/third_party/dart/third_party/pkg/boolean_selector':
-   Var('dart_git') + '/boolean_selector.git@62f82f6a333b419b457e62cadc17b7a9c0545873',
+   Var('dart_git') + '/boolean_selector.git@c5468f44fd9ca0ea3435e1a0a84ff9b6fac38261',
 
   'src/flutter/third_party/dart/third_party/pkg/browser_launcher':
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@c37d5e14f50e72a268c1ad86149cecfa4b58c494',
+   Var('dart_git') + '/cli_util.git@64192706344d0598784bebe1abc4a9bfc2608de0',
 
   'src/flutter/third_party/dart/third_party/pkg/clock':
    Var('dart_git') + '/clock.git' + '@' + Var('dart_clock_rev'),
@@ -374,13 +374,13 @@ deps = {
    Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/convert':
-   Var('dart_git') + '/convert.git@0c9eab7d4656be97329c4970659afd53a78910e6',
+   Var('dart_git') + '/convert.git@9035cafefc1da4315f26058734d0c2a19d5ab56a',
 
   'src/flutter/third_party/dart/third_party/pkg/crypto':
-   Var('dart_git') + '/crypto.git@813e35e913d12e16de67ac57523cd0ff4b07c012',
+   Var('dart_git') + '/crypto.git@1216790ba704a0ab194f9cd0da2d65e1767f3342',
 
   'src/flutter/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@b70fef222c8a98abca39c3f729ec34632089697e',
+   Var('dart_git') + '/csslib.git@192d720f121792ab05ca157ea280edc7e0410e9c',
 
   'src/flutter/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
@@ -392,16 +392,16 @@ deps = {
    Var('dart_git') + '/external/github.com/google/file.dart@07cacaed6679a173e29176747e6ce0325742749f',
 
   'src/flutter/third_party/dart/third_party/pkg/fixnum':
-   Var('dart_git') + '/fixnum.git@a8157d87f17d5184e210403f2ed63d354b854132',
+   Var('dart_git') + '/fixnum.git@6c19e60366ce3d5edfaed51a7c12c98e7977977e',
 
   'src/flutter/third_party/dart/third_party/pkg/glob':
    Var('dart_git') + '/glob.git@6d3ba5ec02817e62d17ace040590bb81a3e1242f',
 
   'src/flutter/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@f6c2c71dd6dc23bda3b4c5ac1290cf7207748071',
+   Var('dart_git') + '/html.git@0da420ca1e196cda54ede476d0d8d3ecf55375ef',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@bf96551406600a2ec520a4248ff635bfd268edeb',
+   Var('dart_git') + '/http.git@8d893851904d8cd292a66e39812b59aca2cc4d96',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@25941e260658efb324de857e6022f418faf9bdd1',
@@ -419,19 +419,19 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
 
   'src/flutter/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@240ec33e23720091e0e5a029d569a3770ddccf1c',
+   Var('dart_git') + '/logging.git@6c3fb37fecb2e30415072f327b834a3e95517fa9',
 
   'src/flutter/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@3d8d7a8f14b74bb646bb6e4ae35e0bf2beb74154',
+   Var('dart_git') + '/markdown.git@62424376d0b5fe35a2957b3caed4b75db010ba82',
 
   'src/flutter/third_party/dart/third_party/pkg/matcher':
-   Var('dart_git') + '/matcher.git@0abd4054c47a923486a6c0c04b5c974ba13ad2da',
+   Var('dart_git') + '/matcher.git@d6d573d0f8d65b36550ce62aad3ce6b5e987b642',
 
   'src/flutter/third_party/dart/third_party/pkg/mime':
-   Var('dart_git') + '/mime.git@fd7010b00ca028918cbd90abc347f98b88b2d00f',
+   Var('dart_git') + '/mime.git@11fec7d6df509a4efd554051cc27e3bf82df9c96',
 
   'src/flutter/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@9deddcfa4b6b6c1ecb3111891c20cc46c115569d',
+   Var('dart_git') + '/mockito.git@a7fdf7101fbd31132a59188a6057d21004345927',
 
   'src/flutter/third_party/dart/third_party/pkg/native':
    Var('dart_git') + '/native.git@fcc783c1d2777555616dfc850f131878ea5d88a9',
@@ -440,10 +440,10 @@ deps = {
    Var('dart_git') + '/package_config.git@903a0e528f91aef90821c8f5eaafbc1ae27198ab',
 
   'src/flutter/third_party/dart/third_party/pkg/path':
-   Var('dart_git') + '/path.git@04807b61c25f98f328b322ec511451f9f86f98bb',
+   Var('dart_git') + '/path.git@e969f42ed112dd702a9453beb9df6c12ae2d3805',
 
   'src/flutter/third_party/dart/third_party/pkg/pool':
-   Var('dart_git') + '/pool.git@832c5ab5eaee444354a8c796f7998bf744f169af',
+   Var('dart_git') + '/pool.git@924fb04353cec915d927f9f1aed88e2eda92b98a',
 
   'src/flutter/third_party/dart/third_party/pkg/protobuf':
    Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -452,13 +452,13 @@ deps = {
    Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/pub_semver':
-   Var('dart_git') + '/pub_semver.git@dfcad38866fb1e94e8ca91bff3dddd5189fb0794',
+   Var('dart_git') + '/pub_semver.git@d9e5ee68a350fbf4319bd4dfcb895fc016337d3a',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@2536c15a562cb183dabbc628824a215663830325',
+   Var('dart_git') + '/shelf.git@9f2dffecbe8f219146a077e401758602752d486a',
 
   'src/flutter/third_party/dart/third_party/pkg/source_map_stack_trace':
-   Var('dart_git') + '/source_map_stack_trace.git@96a8213dacf7cd42aefb1311491a4169826f98d2',
+   Var('dart_git') + '/source_map_stack_trace.git@741b6ceb4b6cdb8ff620664337d7ecc63ca52cc1',
 
   'src/flutter/third_party/dart/third_party/pkg/source_maps':
    Var('dart_git') + '/source_maps.git@caa79c2011015759c6cf3299f299f5cccdf8bb61',
@@ -467,34 +467,34 @@ deps = {
    Var('dart_git') + '/source_span.git@89520f3009e332ce2b6675f71dca166521c36cc4',
 
   'src/flutter/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@7dcde164d5bfe707441f206379ef33e7509e2aac',
+   Var('dart_git') + '/sse.git@52d042ff9ab2d0e5bc26805d74a03077a67861e1',
 
   'src/flutter/third_party/dart/third_party/pkg/stack_trace':
-   Var('dart_git') + '/stack_trace.git@ab09060b82c936c38c04eb49c1154b83f6648349',
+   Var('dart_git') + '/stack_trace.git@4fd3e2a2dc6611febf4cfb9197ebf9e60fc6a34d',
 
   'src/flutter/third_party/dart/third_party/pkg/stream_channel':
-   Var('dart_git') + '/stream_channel.git@dc620d233e0bea618ee22227d4fd487f055b4ead',
+   Var('dart_git') + '/stream_channel.git@28a65331aa2d66a5e953205aa462bcdb1e240a5b',
 
   'src/flutter/third_party/dart/third_party/pkg/string_scanner':
-   Var('dart_git') + '/string_scanner.git@e1cab8f0538b50f6d7180598752cf5a7e07e74db',
+   Var('dart_git') + '/string_scanner.git@0de03b5279a04aa05052ce306f90fca473c6fd1a',
 
   'src/flutter/third_party/dart/third_party/pkg/tar':
    Var('dart_git') + '/external/github.com/simolus3/tar.git@552a49d7595e444184d4f91e9afd533aa253a31d',
 
   'src/flutter/third_party/dart/third_party/pkg/term_glyph':
-   Var('dart_git') + '/term_glyph.git@6c2a9770e786f83bb1a863c6947dde5dcbebdbd2',
+   Var('dart_git') + '/term_glyph.git@38a158f55006cf30942c928171ea601ee5e0308f',
 
   'src/flutter/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@329c6dff4dfcb178ba6c7009cf1c1b9215b317aa',
+   Var('dart_git') + '/test.git@3256c23cc753a184bb3bf27610a7c8410735e3ac',
 
   'src/flutter/third_party/dart/third_party/pkg/test_reflective_loader':
-   Var('dart_git') + '/test_reflective_loader.git@816942eaeeac30cc59d8699f1e94ad779cc53c06',
+   Var('dart_git') + '/test_reflective_loader.git@6e648863b39aab8d0204e769d25805eea9db0ac4',
 
   'src/flutter/third_party/dart/third_party/pkg/tools':
    Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/typed_data':
-   Var('dart_git') + '/typed_data.git@85299290551297a28202b6e7a177bb787f790ffd',
+   Var('dart_git') + '/typed_data.git@365468a74251c930a463daf5b8f13227e269111a',
 
   'src/flutter/third_party/dart/third_party/pkg/watcher':
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
@@ -503,7 +503,7 @@ deps = {
    Var('dart_git') + '/web.git' + '@' + Var('dart_web_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@bf69990738f173c07e67cf6945551194bc8c2d92',
+   Var('dart_git') + '/web_socket_channel.git@8e95ea75302180af075295f7dd7ffe922e26f789',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),
@@ -512,7 +512,7 @@ deps = {
    Var('dart_git') + '/external/github.com/google/webkit_inspection_protocol.dart.git' + '@' + Var('dart_webkit_inspection_protocol_rev'),
 
   'src/flutter/third_party/dart/third_party/pkg/yaml':
-   Var('dart_git') + '/yaml.git@4cf24ca3bbcb2cd8cbea32fdd355ee5d0a597247',
+   Var('dart_git') + '/yaml.git@30fd9e0cd49b2e04f74769f9b24a0300e400403e',
 
   'src/flutter/third_party/dart/third_party/pkg/yaml_edit':
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
@@ -969,7 +969,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'LkXpxHsQlkPT4mmJ7i9vS0-GQmceOV-FpTF-9wxfMFUC'
+        'version': '-VgqOfoW5sf04SuJh64NbuVnDIwiyl7NyTAD4fsTLNkC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart
@@ -1,4 +1,4 @@
-Signature: 6356c8f33f6d603844c3b2ed56745d26
+Signature: 987cab3f3e3a6e4e7248b7606f819b61
 
 ====================================================================================================
 LIBRARY: dart
@@ -4751,7 +4751,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/c23e5814379374504ddad4f68c4ded939fcee0a2
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/ffc8bb004a64f6357e3d5d1185e974e966f00931
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

diff --git a/ci/licenses_golden/licenses_fuchsia b/ci/licenses_golden/licenses_fuchsia
@@ -1,4 +1,4 @@
-Signature: d94be6f5460ab5223d58b2c2defd09d8
+Signature: a0d92f936626b8cb89b8871e340b3f7f
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk

diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
-Signature: 2856c45f73ed1da0f00d150abb3fcc36
+Signature: ae53123dde9d20d55e68125cbde51435
 
 ====================================================================================================
 LIBRARY: etc1

diff --git a/display_list/display_list.h b/display_list/display_list.h
@@ -98,11 +98,9 @@ namespace flutter {
   V(TransformReset)                 \
                                     \
   V(ClipIntersectRect)              \
-  V(ClipIntersectOval)              \
   V(ClipIntersectRRect)             \
   V(ClipIntersectPath)              \
   V(ClipDifferenceRect)             \
-  V(ClipDifferenceOval)             \
   V(ClipDifferenceRRect)            \
   V(ClipDifferencePath)             \
                                     \