Merge branch 'main' of github.com:flutter/engine into compute_uv_vertex_stage

Author: jonahwilliams

.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.6.2-beta1"
+    uses: "google/osv-scanner-action/.github/workflows/osv-scanner-reusable.yml@v1.7.1"
     with:
       # Download the artifact uploaded in extract-deps step
       download-artifact: osv-lockfile-${{github.sha}}

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': '9e20a146c0240e68a5cd41443b6f0756b74df138',
+  'skia_revision': 'f4a214ecf1974eb3289564d5728b3fa8d8f3c079',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -50,7 +50,7 @@ vars = {
   # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/goma/client
   'goma_version': ' git_revision:41b3bcb64014144a844153fd5588c36411fffb56',
 
-  'reclient_version': 'git_revision:f61c232b70bc425f0b562480312b114c444d460d',
+  'reclient_version': 'git_revision:2c9285bdffcfd1b21afb028d57494ff78761af81',
 
   'gcloud_version': 'version:2@444.0.0.chromium.3',
 
@@ -62,7 +62,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': 'ac31be3c8546efbd153838d6f110b586702a397a',
+  'dart_revision': '2ff00e4eb7594f4d1692574821ab12dd2c83344c',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -77,11 +77,11 @@ vars = {
   'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'ccf104dbc36929c0f8708285d5f3a8fae206343e',
-  'dart_pub_rev': 'f3b1199fcab37a197f2980bf6b28e421e7bce771',
+  'dart_pub_rev': '55cc6c138ad4777cf4fc0710c55dc37a33fdcd69',
   'dart_tools_rev': 'd86ea23c79d2e9dc622d3376aa80d94fbf30bf60',
   'dart_watcher_rev': '1bd2f20d0d924c8422aa2b9afdb165bff4f053c0',
-  'dart_web_rev': '3d1b4cbaaf7517cf4f86c8cf8ebe31c67040e08a',
-  'dart_webdev_rev': '7d0d2d46bf4249e73298ddafa4f323f8609d08da',
+  'dart_web_rev': '9d8c802d13b785b1a5b201c4a43605d640841c98',
+  'dart_webdev_rev': '3a10b76f3937fb9b50e7971fb15f82b65dfe05ef',
   'dart_webkit_inspection_protocol_rev': '153fea4fe5ac45bebf0c2e76bb3d76b0f1fcdaae',
   'dart_yaml_edit_rev': 'f5a92b3bc64b4e78ec1fb616ad1dff2174e799b1',
 
@@ -288,7 +288,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'dcd71b5b237e1e58f2ad8a7e51bead0c2a3755a9',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '915f67999bfb4eb77cf596bbadacdce7868ede49',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -397,7 +397,7 @@ deps = {
    Var('dart_git') + '/dart_style.git@a6ad7693555a9add6f98ad6fd94de80d35c89415',
 
   'src/flutter/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@28d0dabbcce6e19cb62daea2db7d5d3d87017dfa',
+   Var('dart_git') + '/dartdoc.git@592694e0557122c59f9eaf007dd8139d84d411d8',
 
   'src/flutter/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@f858c6fe9d1b0167b944aa62dd9b4321036b5238',
@@ -412,7 +412,7 @@ deps = {
    Var('dart_git') + '/html.git@5b99b43f71da0c6b0f962244c7f5dfa8ca970fef',
 
   'src/flutter/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@b7477b1e1bc5c8f850299b7abcc58d08ddea9e4a',
+   Var('dart_git') + '/http.git@34d7087ed2361dbe68faae6af8e7874fb805311d',
 
   'src/flutter/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@6ce0a137aa20cc12b883a386bb7c0ae677cb3429',
@@ -466,7 +466,7 @@ deps = {
    Var('dart_git') + '/pub_semver.git@7581029bf5346fd5a44b95f4686bba8de7598859',
 
   'src/flutter/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@68cb8641c3181cc76006887a7e93b9d3a423f590',
+   Var('dart_git') + '/shelf.git@7352d1b7ac283df8eac36441d7569be8a36757f9',
 
   'src/flutter/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@9ed8875f0933bf0d8e09694211cb9765147b27bb',
@@ -508,7 +508,7 @@ deps = {
    Var('dart_git') + '/typed_data.git@8c7393cbbbba7a5d38c6772371f92d6b38e433fc',
 
   'src/flutter/third_party/dart/third_party/pkg/usage':
-   Var('dart_git') + '/usage.git@09cab899c2759c2e1c84ab49098f58beab3c149f',
+   Var('dart_git') + '/usage.git@2847cdb94e238a921c600e81b52c91baf4ea0b50',
 
   'src/flutter/third_party/dart/third_party/pkg/watcher':
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
@@ -656,7 +656,7 @@ deps = {
    Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
   'src/flutter/third_party/libpng':
-   Var('flutter_git') + '/third_party/libpng' + '@' + '9187b6e12756317f6d44fc669ac11dfc262bd192',
+   Var('flutter_git') + '/third_party/libpng' + '@' + 'de36b892e921c684ef718fec24739ae9bb49c977',
 
   'src/flutter/third_party/libwebp':
    Var('chromium_git') + '/webm/libwebp.git' + '@' + 'ca332209cb5567c9b249c86788cb2dbf8847e760', # 1.3.2
@@ -665,7 +665,10 @@ deps = {
    Var('skia_git') + '/external/github.com/google/wuffs-mirror-release-c.git' + '@' + '600cd96cf47788ee3a74b40a6028b035c9fd6a61',
 
   'src/third_party/zlib':
-   Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
+   Var('chromium_git') + '/chromium/src/third_party/zlib.git' + '@' + '7d77fb7fd66d8a5640618ad32c71fdeb7d3e02df',
+
+  'src/flutter/third_party/cpu_features/src':
+   Var('chromium_git') + '/external/github.com/google/cpu_features.git' + '@' + '936b9ab5515dead115606559502e3864958f7f6e',
 
   'src/flutter/third_party/inja':
    Var('flutter_git') + '/third_party/inja' + '@' + '88bd6112575a80d004e551c98cf956f88ff4d445',
@@ -1024,7 +1027,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'peYcbx9eguHcbhMP00N4RjvNWuk5s5GR4TrllCDBAmIC'
+        'version': 'RruZA4WorQDkGpz25Y1nj91ChnD6UJ4Z5iczfMzg_HQC'
        }
      ],
      'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

build/secondary/flutter/third_party/libwebp/BUILD.gn

@@ -53,7 +53,7 @@ source_set("libwebp") {
   deps = [ ":libwebp_sse41" ]
 
   if (is_android) {
-    deps += [ "//third_party/cpu-features" ]
+    deps += [ "//third_party/cpu_features:ndk_compat" ]
   }
 
   configs += [ ":libwebp_defines" ]

build/secondary/third_party/cpu_features/BUILD.gn

@@ -0,0 +1,7 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("ndk_compat") {
+  public_deps = [ "//flutter/third_party/cpu_features:ndk_compat" ]
+}

ci/builders/mac_host_engine.json

@@ -215,7 +215,6 @@
                     "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
                     "flutter/build/dart:copy_dart_sdk",
-                    "flutter/impeller/golden_tests:impeller_golden_tests",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
                     "flutter/tools/font_subset",
                     "flutter:unittests"
@@ -249,7 +248,7 @@
                         "--variant",
                         "ci/host_release",
                         "--type",
-                        "dart,dart-host,engine,impeller-golden"
+                        "dart,dart-host,engine"
                     ]
                 }
             ]
@@ -405,7 +404,7 @@
             "drone_dimensions": [
                 "device_type=none",
                 "os=Mac-13",
-                "cpu=x86"
+                "cpu=arm64"
             ],
             "gclient_variables": {
                 "download_android_deps": false,
@@ -423,16 +422,21 @@
                 "--prebuilt-dart-sdk",
                 "--rbe",
                 "--no-goma",
-                "--xcode-symlinks"
+                "--xcode-symlinks",
+                "--use-glfw-swiftshader"
             ],
             "name": "ci/mac_release_arm64",
             "description": "Produces release mode arm64 macOS host-side tooling.",
             "ninja": {
                 "config": "ci/mac_release_arm64",
                 "targets": [
-                    "flutter/tools/font_subset",
+                    "flutter:unittests",
+                    "flutter/build/archives:archive_gen_snapshot",
                     "flutter/build/archives:artifacts",
-                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
+                    "flutter/build/dart:copy_dart_sdk",
+                    "flutter/impeller/golden_tests:impeller_golden_tests",
+                    "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework",
+                    "flutter/tools/font_subset"
                 ]
             },
            "postsubmit_overrides": {
@@ -447,14 +451,28 @@
                     "--no-lto",
                     "--prebuilt-dart-sdk",
                     "--no-rbe",
-                    "--no-goma"
+                    "--no-goma",
+                    "--use-glfw-swiftshader"
                 ]
             },
             "properties": {
                 "$flutter/osx_sdk": {
                     "sdk_version": "15a240d"
                 }
-            }
+            },
+            "tests": [
+                {
+                    "language": "python3",
+                    "name": "Impeller-golden for host_release",
+                    "script": "flutter/testing/run_tests.py",
+                    "parameters": [
+                        "--variant",
+                        "ci/mac_release_arm64",
+                        "--type",
+                        "impeller-golden"
+                    ]
+                }
+            ]
         }
     ],
     "generators": {

ci/licenses.sh

@@ -174,7 +174,7 @@ function verify_licenses() (
 
   local actualLicenseCount
   actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=888 # When changing this number: Update the error message below as well describing the newly expected license types.
+  local expectedLicenseCount=890 # When changing this number: Update the error message below as well describing the newly expected license types.
 
   if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
     echo "=============================== ERROR ==============================="

ci/licenses_golden/excluded_files

@@ -1328,6 +1328,21 @@
 ../../../flutter/third_party/boringssl/win-aarch64/crypto/test
 ../../../flutter/third_party/boringssl/win-x86/crypto/test
 ../../../flutter/third_party/boringssl/win-x86_64/crypto/test
+../../../flutter/third_party/cpu_features/src/.clang-format
+../../../flutter/third_party/cpu_features/src/.git
+../../../flutter/third_party/cpu_features/src/.github
+../../../flutter/third_party/cpu_features/src/.gitignore
+../../../flutter/third_party/cpu_features/src/BUILD.bazel
+../../../flutter/third_party/cpu_features/src/CMakeLists.txt
+../../../flutter/third_party/cpu_features/src/CONTRIBUTING.md
+../../../flutter/third_party/cpu_features/src/README.md
+../../../flutter/third_party/cpu_features/src/WORKSPACE
+../../../flutter/third_party/cpu_features/src/bazel/ci/README.md
+../../../flutter/third_party/cpu_features/src/bazel/platforms.bzl
+../../../flutter/third_party/cpu_features/src/cmake
+../../../flutter/third_party/cpu_features/src/ndk_compat/CMakeLists.txt
+../../../flutter/third_party/cpu_features/src/ndk_compat/README.md
+../../../flutter/third_party/cpu_features/src/test
 ../../../flutter/third_party/dart
 ../../../flutter/third_party/dart/.clang-format
 ../../../flutter/third_party/dart/.dart_tool
@@ -2100,7 +2115,10 @@
 ../../../flutter/third_party/libjpeg-turbo/src/simd/CMakeLists.txt
 ../../../flutter/third_party/libjpeg-turbo/src/structure.txt
 ../../../flutter/third_party/libjpeg-turbo/src/wrjpgcom.1
+../../../flutter/third_party/libpng/.appveyor.yml
+../../../flutter/third_party/libpng/.editorconfig
 ../../../flutter/third_party/libpng/.git
+../../../flutter/third_party/libpng/.gitignore
 ../../../flutter/third_party/libpng/.travis.yml
 ../../../flutter/third_party/libpng/ANNOUNCE
 ../../../flutter/third_party/libpng/AUTHORS
@@ -2112,10 +2130,12 @@
 ../../../flutter/third_party/libpng/TODO
 ../../../flutter/third_party/libpng/TRADEMARK
 ../../../flutter/third_party/libpng/aclocal.m4
+../../../flutter/third_party/libpng/ci
 ../../../flutter/third_party/libpng/contrib
 ../../../flutter/third_party/libpng/libpng-manual.txt
 ../../../flutter/third_party/libpng/libpng.3
 ../../../flutter/third_party/libpng/libpngpf.3
+../../../flutter/third_party/libpng/loongarch
 ../../../flutter/third_party/libpng/mips
 ../../../flutter/third_party/libpng/png.5
 ../../../flutter/third_party/libpng/powerpc
@@ -2624,6 +2644,11 @@
 ../../../flutter/third_party/skia/include/gpu/d3d/BUILD.bazel
 ../../../flutter/third_party/skia/include/gpu/ganesh/BUILD.bazel
 ../../../flutter/third_party/skia/include/gpu/ganesh/gl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/gl/egl/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/gl/epoxy/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/gl/glx/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/gl/ios/BUILD.bazel
+../../../flutter/third_party/skia/include/gpu/ganesh/gl/mac/BUILD.bazel
 ../../../flutter/third_party/skia/include/gpu/ganesh/mtl/BUILD.bazel
 ../../../flutter/third_party/skia/include/gpu/ganesh/vk/BUILD.bazel
 ../../../flutter/third_party/skia/include/gpu/gl/BUILD.bazel
@@ -3383,6 +3408,7 @@
 ../../../fuchsia/sdk/linux/pkg/driver_devfs_cpp/meta.json
 ../../../fuchsia/sdk/linux/pkg/driver_incoming_cpp/meta.json
 ../../../fuchsia/sdk/linux/pkg/driver_logging_cpp/meta.json
+../../../fuchsia/sdk/linux/pkg/driver_node_cpp/meta.json
 ../../../fuchsia/sdk/linux/pkg/driver_outgoing_cpp/meta.json
 ../../../fuchsia/sdk/linux/pkg/driver_runtime/meta.json
 ../../../fuchsia/sdk/linux/pkg/driver_runtime_cpp/meta.json
@@ -3500,19 +3526,20 @@
 ../../../third_party/zlib/DIR_METADATA
 ../../../third_party/zlib/OWNERS
 ../../../third_party/zlib/README.chromium
-../../../third_party/zlib/contrib/bench/OWNERS
 ../../../third_party/zlib/contrib/minizip/Makefile
 ../../../third_party/zlib/contrib/minizip/README.chromium
 ../../../third_party/zlib/contrib/minizip/miniunz.c
 ../../../third_party/zlib/contrib/minizip/minizip.c
 ../../../third_party/zlib/contrib/minizip/minizip.md
 ../../../third_party/zlib/contrib/tests
+../../../third_party/zlib/examples
 ../../../third_party/zlib/google/DEPS
 ../../../third_party/zlib/google/OWNERS
 ../../../third_party/zlib/google/compression_utils_unittest.cc
 ../../../third_party/zlib/google/test
 ../../../third_party/zlib/google/zip_reader_unittest.cc
 ../../../third_party/zlib/google/zip_unittest.cc
 ../../../third_party/zlib/patches/README
+../../../third_party/zlib/test
 ../../../third_party/zlib/zlib.3
 ../../../tools

ci/licenses_golden/licenses_dart

@@ -1,4 +1,4 @@
-Signature: 88f7402b221eff690cebce6fc303a6fe
+Signature: fb34ac5e4a1e4b3dad05990b65765b76
 
 ====================================================================================================
 LIBRARY: dart
@@ -4086,6 +4086,7 @@ ORIGIN: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.cc + ../../../flut
 ORIGIN: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.h + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.cc + ../../../flutter/third_party/dart/LICENSE
 ORIGIN: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.h + ../../../flutter/third_party/dart/LICENSE
+ORIGIN: ../../../flutter/third_party/dart/runtime/vm/os.cc + ../../../flutter/third_party/dart/LICENSE
 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
@@ -4095,6 +4096,7 @@ FILE: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.cc
 FILE: ../../../flutter/third_party/dart/runtime/bin/ifaddrs.h
 FILE: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.cc
 FILE: ../../../flutter/third_party/dart/runtime/vm/compiler/backend/dart_calling_conventions.h
+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
@@ -4737,7 +4739,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/+/ac31be3c8546efbd153838d6f110b586702a397a
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/2ff00e4eb7594f4d1692574821ab12dd2c83344c
 /third_party/fallback_root_certificates/
 
 ====================================================================================================