Merge branch 'master' of github.com:flutter/engine into fix_perspective

Author: jonahwilliams

.ci.yaml

@@ -156,6 +156,19 @@ targets:
       fuchsia_ctl_version: version:0.0.27
       # ensure files from pre-production Fuchsia SDK tests are purged from cache
       clobber: "true"
+      emulator_arch: "x64"
+    timeout: 60
+
+  - name: Linux Fuchsia arm64 FEMU
+    recipe: engine/femu_test
+    bringup: true
+    properties:
+      add_recipes_cq: "true"
+      build_fuchsia: "true"
+      fuchsia_ctl_version: version:0.0.27
+      # ensure files from pre-production Fuchsia SDK tests are purged from cache
+      clobber: "true"
+      emulator_arch: "arm64"
     timeout: 60
 
   - name: Linux Framework Smoke Tests
@@ -168,6 +181,8 @@ targets:
   - name: Linux Host Engine
     recipe: engine/engine
     properties:
+      gclient_variables: >-
+        {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
     timeout: 60
@@ -273,7 +288,7 @@ targets:
       dependencies: >-
         [
           {"dependency": "chrome_and_driver", "version": "version:107.0"},
-          {"dependency": "firefox", "version": "version:83.0"},
+          {"dependency": "firefox", "version": "version:106.0"},
           {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
         ]
     timeout: 60
@@ -324,6 +339,8 @@ targets:
   - name: Mac Host Engine
     recipe: engine/engine
     properties:
+      gclient_variables: >-
+        {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
       jazzy_version: "0.14.1"
@@ -473,6 +490,8 @@ targets:
     recipe: engine/engine
     timeout: 60
     properties:
+      gclient_variables: >-
+        {"download_emsdk": true}
       add_recipes_cq: "true"
       build_host: "true"
 

.github/workflows/scorecards-analysis.yml

@@ -11,7 +11,7 @@ permissions: read-all
 jobs:
   vuln-scan:
     name: Vulnerability scanning
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: ${{ github.repository == 'flutter/engine' }}
     steps:
       - name: "Checkout code"

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': '6f65f0631e5aba06582c59502b1274f8714fa127',
+  'skia_revision': '28c1bbab82b82932bf653959fbc465acff56d905',
 
   # 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': 'eddf73d661193f21e8db15d6530d049498712f40',
+  'dart_revision': '6b7e44ae494ba6a8520fca78d75f297ecaaae043',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -58,12 +58,12 @@ vars = {
   'dart_browser_launcher_rev': '5fa0bd6cddc33785f43c920576fc03dcee1c3caa',
   'dart_clock_rev': '8a8231fa7912d84c7e99236b7800cfbef5ea7ae5',
   'dart_collection_rev': 'efd709fc1760a595f8575f4137a1847de1b49d76',
-  'dart_devtools_rev': '23444af89d716818f099974df3e4fffac87fd886',
-  'dart_protobuf_rev': 'ae90e53cd690edbfc72fa6c293fdb7b4a09ee0a2',
-  'dart_pub_rev': '6ac42d7644dedfcc500147ab47886eecab4b1b38',
+  'dart_devtools_rev': 'dd3fade2bd2ef74fc6102e56333a48f0efc594d3',
+  'dart_protobuf_rev': 'c181573c330ff0337db0bab5501deda3a42ba028',
+  'dart_pub_rev': '867ad175d81713c4e70473b1ab32107547cbdc3e',
   'dart_root_certificates_rev': '692f6d6488af68e0121317a9c2c9eb393eb0ee50',
   'dart_watcher_rev': '32591071a83f632478e702f67e29de6e54428ce9',
-  'dart_webdev_rev': '3ec168f6815af9d5f11278111d147bc82c0755c3',
+  'dart_webdev_rev': '637b406f325669507b5c1048c19a7c0083c1bd6e',
   'dart_webkit_inspection_protocol_rev': 'ddb624cd85954dd384056cc253a8fc2b9da5364d',
   'dart_yaml_edit_rev': '299f74594ff9fda412c1da5c0b5d5231d0c6fc42',
   'dart_zlib_rev': '27c2f474b71d0d20764f86f60ef8b00da1a16cda',
@@ -148,6 +148,7 @@ vars = {
   "upstream_http_parser": "https://github.com/dart-lang/http_parser.git",
   "upstream_http": "https://github.com/dart-lang/http.git",
   "upstream_icu": "https://github.com/unicode-org/icu.git",
+  "upstream_intl": "https://github.com/dart-lang/intl.git",
   "upstream_imgui": "https://github.com/ocornut/imgui.git",
   "upstream_inja": "https://github.com/pantor/inja.git",
   "upstream_json": "https://github.com/nlohmann/json.git",
@@ -235,7 +236,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f63462fc605c94da9301d7263ce1b1f53bf4188a',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '8747bce41d0dc6d9dc45c4d1b46d2100bb9ee688',
 
    # Fuchsia compatibility
    #
@@ -268,7 +269,7 @@ deps = {
    Var('github_git') + '/google/flatbuffers.git' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
   'src/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'da07448619763d1cde255b361324242646f5b268',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '1b7d391f0528fb3a4976b7541b387ee04f915f83',
 
   'src/third_party/khronos':
    Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '676d544d2b8f48903b7da9fceffaa534a5613978',
@@ -300,7 +301,7 @@ deps = {
    Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git@ec53f4b2d5b0d52ae703c5b696ecf052ad5fffbb',
 
   'src/third_party/dart/third_party/devtools':
-   {'packages': [{'version': 'git_revision:23444af89d716818f099974df3e4fffac87fd886', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'git_revision:dd3fade2bd2ef74fc6102e56333a48f0efc594d3', 'package': 'dart/third_party/flutter/devtools'}], 'dep_type': 'cipd'},
 
   'src/third_party/dart/third_party/pkg/args':
    Var('dart_git') + '/args.git@da037acc018a8dd267d109eb634454490b7ff759',
@@ -342,7 +343,7 @@ deps = {
    Var('dart_git') + '/dartdoc.git@dc502d0862fe1ba8451c9c57cd7ab70432634af3',
 
   'src/third_party/dart/third_party/pkg/ffi':
-   Var('dart_git') + '/ffi.git@3ede2312dd6ec37db6e7bcd6e1236647f72c7fc0',
+   Var('dart_git') + '/ffi.git@17a8142da8114a065e03200467c7657b5368a86d',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart@b768f79dcd104a5feabafab47101c4355b71cd8f',
@@ -357,14 +358,17 @@ deps = {
    Var('dart_git') + '/html.git@28fb8b97acf471bedcfa4eaf38899a0f65d5e30d',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@d56141de40b69e8ae3cc22602caea6cca3fba4dc',
+   Var('dart_git') + '/http.git@047d6ed015d397be169a7fb892d75141d9bfd58f',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@e31c6988e3869fb4019429254604066338f86095',
 
   'src/third_party/dart/third_party/pkg/http_parser':
    Var('dart_git') + '/http_parser.git@c73967535ce31120e218120f70ef98cc22688c82',
 
+  'src/third_party/dart/third_party/pkg/intl':
+   Var('dart_git') + '/intl.git@a127902594a964f2090239fb454adadf7c1a77ef',
+
   'src/third_party/dart/third_party/pkg/json_rpc_2':
    Var('dart_git') + '/json_rpc_2.git@16fed53fbebd38edf170f58c1da1de2a325b2b98',
 
@@ -375,7 +379,7 @@ deps = {
    Var('dart_git') + '/logging.git@f322480fb9d9e83e677c08db6d09067059f7ff74',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@37951d151750acfae756b2e466f563c1c5119b3d',
+   Var('dart_git') + '/markdown.git@ee3f4e976efcfed87c6ec78364bc2dd3c6e717b9',
 
   'src/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@15d4af21002ae9adee952110192a3face96307c7',
@@ -402,7 +406,7 @@ 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@28159b8c5b96fc2709d0904389d7932880f68659',
+   Var('dart_git') + '/pub_semver.git@17231113f98c80285881cc4452863bcfd085d1a8',
 
   'src/third_party/dart/third_party/pkg/shelf':
    Var('dart_git') + '/shelf.git@1c2104737973715426035c11ba840c7f23d8f186',
@@ -417,7 +421,7 @@ deps = {
    Var('dart_git') + '/source_span.git@d1d47e550b6f77ed9b4907339a8a5e430b9ca314',
 
   'src/third_party/dart/third_party/pkg/sse':
-   Var('dart_git') + '/sse.git@283568dd4865cc51e25370ed107fcbdb68759c22',
+   Var('dart_git') + '/sse.git@8d018dd606f1f8a957c51de16159d532ce664569',
 
   'src/third_party/dart/third_party/pkg/stack_trace':
    Var('dart_git') + '/stack_trace.git@dce00134f6558086e8963e37d0b1ba0830862c01',
@@ -432,7 +436,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@822cd5b3418615c6db715a796c2c9ba9acb63b0d',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@7756833000d671d4540b37ef04acd4b9e716026f',
+   Var('dart_git') + '/test.git@b25dac9936c2ea9605b54a3418e0c956937da48f',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@52b6753852661787208e003f9716b079026c7ac7',
@@ -462,7 +466,7 @@ deps = {
    Var('dart_git') + '/yaml_edit.git' + '@' + Var('dart_yaml_edit_rev'),
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.18.0', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.19.0-374.0.dev', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
 
   # WARNING: end of dart dependencies list that is cleaned up automatically - see create_updated_flutter_deps.py.
 
@@ -812,7 +816,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'CUPWWG1rEmonxuLpvYlS13vjzAMwYiaL2vhL6K2DnoYC'
+        'version': 'aHgLxcRDjOQNKL7zH-uLBl9KVg7rLcHKQO1GVQ3eXpcC'
        }
      ],
      'condition': 'host_os == "mac" and not download_fuchsia_sdk',

ci/analyze.sh

@@ -52,6 +52,7 @@ echo ""
 
 "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/flutter_frontend_server"
 
+(cd "$FLUTTER_DIR/tools/gen_web_locale_keymap"; "$DART" pub get)
 "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/tools"
 
 (cd "$FLUTTER_DIR/testing/skia_gold_client"; "$DART" pub get)

ci/licenses.sh

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

ci/licenses_golden/licenses_flutter

@@ -1,6 +1,31 @@
 UNUSED LICENSES:
 
-
+====================================================================================================
+ORIGIN: ../../../flutter/third_party/web_locale_keymap/License.txt
+TYPE: LicenseType.mit
+----------------------------------------------------------------------------------------------------
+MIT License
+
+Copyright (c) 2015 - present Microsoft Corporation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 USED LICENSES:
 
@@ -565,6 +590,35 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ====================================================================================================
 
+====================================================================================================
+LIBRARY: web_locale_keymap
+ORIGIN: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart + ../../../flutter/third_party/web_locale_keymap/License.txt
+TYPE: LicenseType.mit
+FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap.dart
+FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/key_mappings.g.dart
+FILE: ../../../flutter/third_party/web_locale_keymap/lib/web_locale_keymap/locale_keymap.dart
+----------------------------------------------------------------------------------------------------
+Copyright (c) 2022 Google LLC
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+====================================================================================================
+
 ====================================================================================================
 LIBRARY: accessibility
 ORIGIN: ../../../flutter/third_party/accessibility/ax/ax_export.h + ../../../LICENSE
@@ -1594,15 +1648,26 @@ FILE: ../../../flutter/impeller/scene/camera.cc
 FILE: ../../../flutter/impeller/scene/camera.h
 FILE: ../../../flutter/impeller/scene/geometry.cc
 FILE: ../../../flutter/impeller/scene/geometry.h
+FILE: ../../../flutter/impeller/scene/importer/importer.h
+FILE: ../../../flutter/impeller/scene/importer/importer_gltf.cc
+FILE: ../../../flutter/impeller/scene/importer/importer_main.cc
+FILE: ../../../flutter/impeller/scene/importer/mesh.fbs
+FILE: ../../../flutter/impeller/scene/importer/switches.cc
+FILE: ../../../flutter/impeller/scene/importer/switches.h
+FILE: ../../../flutter/impeller/scene/importer/types.h
 FILE: ../../../flutter/impeller/scene/material.cc
 FILE: ../../../flutter/impeller/scene/material.h
 FILE: ../../../flutter/impeller/scene/scene.cc
 FILE: ../../../flutter/impeller/scene/scene.h
+FILE: ../../../flutter/impeller/scene/scene_context.cc
+FILE: ../../../flutter/impeller/scene/scene_context.h
 FILE: ../../../flutter/impeller/scene/scene_encoder.cc
 FILE: ../../../flutter/impeller/scene/scene_encoder.h
 FILE: ../../../flutter/impeller/scene/scene_entity.cc
 FILE: ../../../flutter/impeller/scene/scene_entity.h
 FILE: ../../../flutter/impeller/scene/scene_unittests.cc
+FILE: ../../../flutter/impeller/scene/shaders/geometry.vert
+FILE: ../../../flutter/impeller/scene/shaders/unlit.frag
 FILE: ../../../flutter/impeller/scene/static_mesh_entity.cc
 FILE: ../../../flutter/impeller/scene/static_mesh_entity.h
 FILE: ../../../flutter/impeller/tessellator/c/tessellator.cc
@@ -1716,7 +1781,11 @@ FILE: ../../../flutter/lib/ui/painting/image_descriptor.h
 FILE: ../../../flutter/lib/ui/painting/image_dispose_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/image_encoding.cc
 FILE: ../../../flutter/lib/ui/painting/image_encoding.h
+FILE: ../../../flutter/lib/ui/painting/image_encoding_impeller.cc
+FILE: ../../../flutter/lib/ui/painting/image_encoding_impeller.h
 FILE: ../../../flutter/lib/ui/painting/image_encoding_impl.h
+FILE: ../../../flutter/lib/ui/painting/image_encoding_skia.cc
+FILE: ../../../flutter/lib/ui/painting/image_encoding_skia.h
 FILE: ../../../flutter/lib/ui/painting/image_encoding_unittests.cc
 FILE: ../../../flutter/lib/ui/painting/image_filter.cc
 FILE: ../../../flutter/lib/ui/painting/image_filter.h
@@ -3115,6 +3184,7 @@ FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/plu
 FILE: ../../../flutter/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/cursor_handler.cc
 FILE: ../../../flutter/shell/platform/windows/cursor_handler.h
+FILE: ../../../flutter/shell/platform/windows/cursor_handler_unittests.cc
 FILE: ../../../flutter/shell/platform/windows/direct_manipulation.cc
 FILE: ../../../flutter/shell/platform/windows/direct_manipulation.h
 FILE: ../../../flutter/shell/platform/windows/direct_manipulation_unittests.cc
@@ -3766,4 +3836,4 @@ shall not be used in advertising or otherwise to promote the sale,
 use or other dealings in these Data Files or Software without prior
 written authorization of the copyright holder.
 ====================================================================================================
-Total license count: 17
+Total license count: 19