Merge remote-tracking branch 'upstream/main' into rrect-blur-match-gaussian

Author: gaaclarke

BUILD.gn

@@ -283,7 +283,10 @@ if (build_engine_artifacts) {
 group("dist") {
   testonly = true
 
-  deps = [ "//flutter/sky/dist" ]
+  deps = [
+    "//flutter/lib/gpu/dist",
+    "//flutter/sky/dist",
+  ]
 }
 
 if (is_fuchsia && enable_unittests) {

CONTRIBUTING.md

@@ -33,7 +33,7 @@ with `gn format`.
 
 [code_of_conduct]: https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md
 [contrib_guide]: https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md
-[engine_dev_setup]: https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment
+[engine_dev_setup]: https://github.com/flutter/flutter/blob/master/docs/engine/contributing/Setting-up-the-Engine-development-environment.md
 [objc_style]: https://google.github.io/styleguide/objcguide.html
 [objcc_style]: https://google.github.io/styleguide/objcguide.html#objective-c
 [java_style]: https://google.github.io/styleguide/javaguide.html

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': '0026a60471337507a6557a492bd8f0c95a688e17',
+  'skia_revision': '337c3c4d1f1b4a1d9ea906d1e4c45c995c859e00',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -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': '641d61332238ceeaa6b3788ddf0769e4e1d71039',
+  'dart_revision': '2976c1694eed29601f676f6297fd7914b82a3594',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -65,7 +65,7 @@ vars = {
   'dart_boringssl_rev': 'd24a38200fef19150eef00cad35b138936c08767',
   'dart_browser_launcher_rev': '0dcf2246c11eaf6c4f2591332f1057734a847793',
   'dart_clock_rev': '80e70acf72cc3a876d3158911b097b581cd8fd1a',
-  'dart_collection_rev': '471839875a3bbfb26a7d51eca82be5b788660982',
+  'dart_collection_rev': 'fe2e80039b6d44d80f7465535988f935ccf554a5',
   'dart_devtools_rev': 'e2a7208bb8eed852b1f9dedabf423f187e947a7d',
   'dart_libprotobuf_rev': '24487dd1045c7f3d64a21f38a3f0c06cc4cf2edb',
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
@@ -74,8 +74,8 @@ vars = {
   'dart_pub_rev': '75ab224376e80e918d3c53494a36d4bf8a2f2af6',
   'dart_tools_rev': '86b3661fc4ccbcda5b662ff3075177448eeeba11',
   'dart_watcher_rev': 'c182cd3db6f0bc285bf5da52df422f5c64f21a37',
-  'dart_web_rev': 'd7766451f43001276b5493b2261d2973702b8334',
-  'dart_webdev_rev': 'fc32eb69f2ad666e9ab1cb3300510e5daed222d6',
+  'dart_web_rev': 'f6f778bad31f7aaef22cf7e04f30b7bd1f8e4bb7',
+  'dart_webdev_rev': '1bed26ab085bb83a050e286ac76c393c96d3d253',
   'dart_webkit_inspection_protocol_rev': '5740cc91eaeb13a02007b77b128fccf4b056db6e',
   'dart_yaml_edit_rev': '31919348bd2a1bbb805b4eb88a6b7f50d4ab247e',
 
@@ -350,16 +350,16 @@ deps = {
    {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:e2a7208bb8eed852b1f9dedabf423f187e947a7d'}]},
 
   'src/flutter/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@cf905519d67054a5e8d8835ffd4b247d8bbb602d',
+   Var('dart_git') + '/args.git@b3608bd95168428621689dce62f873b76a1617d4',
 
   'src/flutter/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@77a25d77392b131df4ecac85bcfe9a30f82a9f40',
+   Var('dart_git') + '/async.git@f933ddff63021bfbdb70938d6a137eb9e7419b05',
 
   'src/flutter/third_party/dart/third_party/pkg/bazel_worker':
    Var('dart_git') + '/bazel_worker.git@2fb4fbff6ee8d26fee1f3576fa0500057d897afd',
 
   'src/flutter/third_party/dart/third_party/pkg/boolean_selector':
-   Var('dart_git') + '/boolean_selector.git@2cbd4a60b89fe51a404e9ee3625a8fb8019561dd',
+   Var('dart_git') + '/boolean_selector.git@84467e580fa1c7c53ea588308f1acbcf4e8eb6a6',
 
   'src/flutter/third_party/dart/third_party/pkg/browser_launcher':
    Var('dart_git') + '/browser_launcher.git' + '@' + Var('dart_browser_launcher_rev'),
@@ -386,7 +386,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@1e1a004c69022ae19e121b6b9c90039dccd56749',
+   Var('dart_git') + '/dartdoc.git@ed975850ec97bbccba1c5c2a997e2c085ef842da',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@8ce0d13ffe9dac267bdbd6c65c145ba4f611af72',
@@ -401,7 +401,7 @@ deps = {
    Var('dart_git') + '/html.git@00d34611eee5eff976bd12a631357a4d591ef5fb',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@7df2ac8488ec69ee5945ae188625c0e820c4f63c',
+   Var('dart_git') + '/http.git@6337ee3f6d1f641192ba40e133f27085c69aa815',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@4a791af861da1cf53b57d9928fbc605f57139e4f',
@@ -422,7 +422,7 @@ deps = {
    Var('dart_git') + '/logging.git@49d89b1de6e847174bc93b709e858b99e61b2ae7',
 
   'src/flutter/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@340c76f6cab697ca9a51e0772009347400d9488a',
+   Var('dart_git') + '/markdown.git@c1013dc6fc2653baeb9fac70d0a036615867e629',
 
   'src/flutter/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@4ac4096facce24a781ab6609ca99995aeb443b25',
@@ -455,7 +455,7 @@ deps = {
    Var('dart_git') + '/pub_semver.git@f57c9c31dfd4e45ce6b11f18ee388e526ba1792a',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@d9f82bf2cdd87e2878cfdc167aa41b9ce87a52d8',
+   Var('dart_git') + '/shelf.git@338962c5a80761ca60921fc9c9b3e6ff57ffc82c',
 
   'src/flutter/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@6834af5e9e4ba880741b1357a5967fee8d90827c',
@@ -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@45b8ce9ce9fb5194a24d3dff8913c573fbe7896a',
+   Var('dart_git') + '/web_socket_channel.git@afd1e3c8327d542d2c7e28b5c9c1ec2282ee5fdf',
 
   'src/flutter/third_party/dart/third_party/pkg/webdev':
    Var('dart_git') + '/webdev.git' + '@' + Var('dart_webdev_rev'),

build/archives/BUILD.gn

@@ -87,10 +87,6 @@ if (build_engine_artifacts && !is_android) {
           source = "//flutter/impeller/compiler/shader_lib"
           destination = "shader_lib"
         },
-        {
-          source = "//flutter/lib/gpu"
-          destination = "flutter_gpu"
-        },
         {
           source = "$root_out_dir/${lib_prefix}path_ops$dll"
           destination = "${lib_prefix}path_ops$dll"

build/config/fuchsia/gn_configs.gni

@@ -25,7 +25,7 @@ declare_args() {
 # value to specify the API level the packages produced from this repository
 # should be targeting, e.g. in their top-level //.gn file. A value of -1
 # means that no API level will be passed to the tools that consumes it.
-fuchsia_target_api_level = 17
+fuchsia_target_api_level = 18
 
 # The SDK manifest file. This is useful to include as a dependency
 # for some targets in order to cause a rebuild when the version of the

ci/bin/format.dart

@@ -475,6 +475,7 @@ class JavaFormatChecker extends FormatChecker {
       path.absolute(
         path.join(
           srcDir.absolute.path,
+          'flutter',
           'third_party',
           'android_tools',
           'google-java-format',

ci/builders/linux_android_debug_engine.json

@@ -68,7 +68,8 @@
                         "out/ci/android_debug/zip_archives/android-arm/symbols.zip",
                         "out/ci/android_debug/zip_archives/download.flutter.io",
                         "out/ci/android_debug/zip_archives/sky_engine.zip",
-                        "out/ci/android_debug/zip_archives/android-javadoc.zip"
+                        "out/ci/android_debug/zip_archives/android-javadoc.zip",
+                        "out/ci/android_debug/zip_archives/flutter_gpu.zip"
                     ],
                     "realm": "production"
                 }
@@ -96,6 +97,7 @@
                 "targets": [
                     "flutter",
                     "flutter/sky/dist:zip_old_location",
+                    "flutter/lib/gpu/dist:zip_old_location",
                     "flutter/shell/platform/android:embedding_jars",
                     "flutter/shell/platform/android:abi_jars",
                     "flutter/shell/platform/android:robolectric_tests"

ci/licenses_golden/excluded_files

@@ -138,13 +138,15 @@
 ../../../flutter/impeller/compiler/shader_bundle_unittests.cc
 ../../../flutter/impeller/compiler/switches_unittests.cc
 ../../../flutter/impeller/core/allocator_unittests.cc
+../../../flutter/impeller/display_list/aiks_dl_opacity_unittests.cc
 ../../../flutter/impeller/display_list/aiks_dl_path_unittests.cc
 ../../../flutter/impeller/display_list/dl_golden_unittests.cc
 ../../../flutter/impeller/display_list/dl_golden_unittests.h
 ../../../flutter/impeller/display_list/dl_unittests.cc
 ../../../flutter/impeller/display_list/skia_conversions_unittests.cc
 ../../../flutter/impeller/docs
 ../../../flutter/impeller/entity/contents/clip_contents_unittests.cc
+../../../flutter/impeller/entity/contents/filters/blend_filter_contents_unittests.cc
 ../../../flutter/impeller/entity/contents/filters/gaussian_blur_filter_contents_unittests.cc
 ../../../flutter/impeller/entity/contents/filters/inputs/filter_input_unittests.cc
 ../../../flutter/impeller/entity/contents/filters/matrix_filter_contents_unittests.cc

ci/licenses_golden/licenses_dart

@@ -1,4 +1,4 @@
-Signature: d0d399e3e22361d9a63177d3e4f49d0d
+Signature: c31227f6bc734be13c25b2bc7fbe6725
 
 ====================================================================================================
 LIBRARY: dart
@@ -4091,7 +4091,6 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/vm/os.cc + ../../../flutter/th
 ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart + ../../../flutter/third_party/dart/LICENSE
-ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart + ../../../flutter/third_party/dart/LICENSE
 TYPE: LicenseType.bsd
 FILE: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.cc
@@ -4103,7 +4102,6 @@ FILE: ../../../flutter/third_party/dart/runtime/vm/os.cc
 FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_dev_runtime/private/ddc_only.dart
 FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/dart2js_only.dart
 FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_runtime/lib/synced/invocation_mirror_constants.dart
-FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/js_shared/lib/date_time_patch.dart
 FILE: ../../../flutter/third_party/dart/sdk/lib/_internal/wasm/lib/compact_hash.dart
 ----------------------------------------------------------------------------------------------------
 Copyright (c) 2024, the Dart project authors.  Please see the AUTHORS file
@@ -4743,7 +4741,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/+/fef7786d65f905df9fe197afd2e5c92b73b202fe
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2976c1694eed29601f676f6297fd7914b82a3594
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

ci/licenses_golden/licenses_skia

@@ -1,4 +1,4 @@
-Signature: df8ad9bce63360edb0d1c6e9ffc78ea1
+Signature: 0a0f558bca63955f5ecfc0c32a1fd56a
 
 ====================================================================================================
 LIBRARY: etc1
@@ -397,6 +397,7 @@ FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/pathops.bench.js
 FILE: ../../../flutter/third_party/skia/modules/pathkit/perf/perfReporter.js
 FILE: ../../../flutter/third_party/skia/modules/skparagraph/test.html
 FILE: ../../../flutter/third_party/skia/package-lock.json
+FILE: ../../../flutter/third_party/skia/relnotes/UvecN.md
 FILE: ../../../flutter/third_party/skia/relnotes/mask-filters.md
 FILE: ../../../flutter/third_party/skia/src/gpu/gpu_workaround_list.txt
 FILE: ../../../flutter/third_party/skia/src/ports/fontations/Cargo.toml