Merge remote-tracking branch 'upstream/master' into block-level-text-height-behavior

Author: LongCatIsLooong

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,59 +1,32 @@
-## Description
+*Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.*
 
-*Replace this paragraph with a description of what this PR is doing. If you're
-modifying existing behavior, describe the existing behavior, how this PR is
-changing it, and what motivated the change.*
+*List which issues are fixed by this PR. You must list at least one issue.*
 
-## Related Issues
+*If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].*
 
-*Replace this paragraph with a list of issues related to this PR from our [issue
-database]. Indicate, which of these issues are resolved or fixed by this PR.
-There should be at least one issue listed here.*
+## Pre-launch Checklist
 
-## Tests
-
-I added the following tests:
-
-*Replace this with a list of the tests that you added as part of this PR. A
-change in behaviour with no test covering it will likely get reverted
-accidentally sooner or later. PRs must include tests for all
-changed/updated/fixed behaviors. See [testing the engine] for instructions on
-writing and running engine tests.*
-
-## Checklist
-
-Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (`[x]`). This will ensure a smooth and quick review process.
-
-- [ ] I read the [contributor guide] and followed the process outlined there for submitting PRs.
+- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
+- [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
+- [ ] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides].
+- [ ] I listed at least one issue that this PR fixes in the description above.
+- [ ] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See [testing the engine] for instructions on
+writing and running engine tests.
+- [ ] I updated/added relevant documentation (doc comments with `///`).
 - [ ] I signed the [CLA].
-- [ ] I read and followed the [C++, Objective-C, Java style guides] for the engine.
-- [ ] I read the [tree hygiene] wiki page, which explains my responsibilities.
-- [ ] I updated/added relevant documentation.
 - [ ] All existing and new tests are passing.
-- [ ] I am willing to follow-up on review comments in a timely manner.
-
-
-## Reviewer Checklist
+- [ ] The reviewer has submitted any presubmit flakes in this PR using the [engine presubmit flakes form] before re-triggering the failure.
 
-- [ ] I have submitted any presubmit flakes in this PR using the [engine presubmit flakes form] before re-triggering the failure.
-
-
-## Breaking Change
-
-Did any tests fail when you ran them? Please read [handling breaking changes].
-
-- [ ] No, no existing tests failed, so this is *not* a breaking change.
-- [ ] Yes, this is a breaking change. *If not, delete the remainder of this section.*
-   - [ ] I wrote a design doc: https://flutter.dev/go/template *Replace this with a link to your design doc's short link*
-   - [ ] I got input from the developer relations team, specifically from: *Replace with the names of who gave advice*
-   - [ ] I wrote a migration guide: https://flutter.dev/go/breaking-changes-template *Replace this with a link to a pull request that adds the migration guide to https://flutter.dev/docs/release/breaking-changes*
+If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
 <!-- Links -->
-[issue database]: https://github.com/flutter/flutter/issues
-[contributor guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
-[testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine
+[Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview
+[Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
+[Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo
 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style
+[testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine
 [CLA]: https://cla.developers.google.com/
-[tree hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene
-[handling breaking changes]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
+[flutter/tests]: https://github.com/flutter/tests
+[breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
+[Discord]: https://github.com/flutter/flutter/wiki/Chat
 [engine presubmit flakes form]: https://forms.gle/Wc1VyFRYJjQTH6w5A

.gitignore

@@ -4,6 +4,7 @@
 .*.sw?
 .DS_Store
 .ccls-cache
+.cache
 .classpath
 .clangd/
 .cproject

BUILD.gn

@@ -62,6 +62,11 @@ group("flutter") {
       public_deps += [
         "//flutter/flutter_frontend_server:frontend_server",
         "//third_party/dart:create_sdk",
+
+        # This must be listed explicitly for desktop cross-builds since
+        # //flutter/lib/snapshot:generate_snapshot_bin will only build
+        # gen_snapshot for the host and not the target.
+        "//third_party/dart/runtime/bin:gen_snapshot",
       ]
 
       if (full_dart_sdk) {
@@ -159,8 +164,10 @@ group("flutter") {
 
       if (is_win) {
         if (target_os == "winuwp") {
-          # TODO: Add winnup variant of the unit tests here; see
+          # TODO: Add winnup variant of client_wrapper_windows_unittests here; see
           # https://github.com/flutter/flutter/issues/70197
+          public_deps +=
+              [ "//flutter/shell/platform/windows:flutter_windows_unittests" ]
         } else {
           public_deps += [
             "//flutter/shell/platform/windows:flutter_windows_unittests",

DEPS

@@ -21,35 +21,36 @@ vars = {
   'chromium_git': 'https://chromium.googlesource.com',
   'swiftshader_git': 'https://swiftshader.googlesource.com',
   'dart_git': 'https://dart.googlesource.com',
+  'flutter_git': 'https://flutter.googlesource.com',
   'fuchsia_git': 'https://fuchsia.googlesource.com',
   'github_git': 'https://github.com',
   'skia_git': 'https://skia.googlesource.com',
   # OCMock is for testing only so there is no google clone
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
-  'skia_revision': 'd8e9436a78bf19c32e3c43a5bd953a5b579ded5a',
+  'skia_revision': '9ff7b8d675591ad2ca8bdbb9cfbd30cdef0f146c',
 
   # When updating the Dart revision, ensure that all entries that are
   # dependencies of Dart are also updated to match the entries in the
   # Dart SDK's DEPS file for that revision of Dart. The DEPS file for
   # Dart is: https://github.com/dart-lang/sdk/blob/master/DEPS.
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '724d9e5e7d7111b4c76abd3cfab99be90f218fbf',
+  'dart_revision': '75251de89baf49c2b3722abde3fd79fb4a710f50',
 
   # 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_boringssl_gen_rev': '429ccb1877f7987a6f3988228bc2440e61293499',
+  'dart_boringssl_gen_rev': 'aaac86738c4f2d1bdf00f54d197f50f247ffee04',
   'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce',
   'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3',
   'dart_collection_rev': 'e4bb038ce2d8e66fb15818aa40685c68d53692ab',
-  'dart_dart_style_tag': '1.3.10',
+  'dart_dart_style_tag': '1.3.11',
   'dart_http_retry_tag': '0.1.1',
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.17.0-nullsafety',
-  'dart_linter_tag': '0.1.127',
+  'dart_linter_tag': '0.1.129',
   'dart_oauth2_tag': '1.6.0',
   'dart_protobuf_rev': '0d03fd588df69e9863e2a2efc0059dee8f18d5b2',
-  'dart_pub_rev': '392a3cb455af48f7ce8807a96174691945f97f0a',
+  'dart_pub_rev': '0e657414a472e74ca5dd76ae0db50cc060251dec',
   'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
   'dart_root_certificates_rev': '7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8',
   'dart_shelf_packages_handler_tag': '2.0.0',
@@ -92,13 +93,14 @@ gclient_gn_args = [
 # If you need to add a new host, contact chrome infrastructure team.
 allowed_hosts = [
   'chromium.googlesource.com',
+  'flutter.googlesource.com',
   'fuchsia.googlesource.com',
   'github.com',
   'skia.googlesource.com',
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '3d37855508a4de2481ad0fead8e15563f0210c2c',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '7565131390a39d9d6c460545d7992d76a0faa262',
 
    # Fuchsia compatibility
    #
@@ -189,10 +191,10 @@ deps = {
    Var('dart_git') + '/dart2js_info.git@e0acfeb5affdf94c53067e68bd836adf589628fd',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@a1d86f2c992f4660ddcc09b27733396e92765d2a',
+   Var('dart_git') + '/dartdoc.git@9e61a4f11091aaa8998525a2692b14148dc24ab5',
 
   'src/third_party/dart/third_party/pkg/ffi':
-   Var('dart_git') + '/ffi.git@31352979f261f7c6ea88fa0a2cfb0fdd004c38fb',
+   Var('dart_git') + '/ffi.git@f288e906c92e2ab378768dfa61a40814ede7a2a5',
 
   'src/third_party/dart/third_party/pkg/file':
    Var('dart_git') + '/external/github.com/google/file.dart/@0e09370f581ab6388d46fda4cdab66638c0171a1',
@@ -204,10 +206,10 @@ deps = {
    Var('dart_git') + '/glob.git@7c0ef8d4fa086f6b185c4dd724b700e7d7ad8f79',
 
   'src/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@22f17e97fedeacaa1e945cf84d8016284eed33a6',
+   Var('dart_git') + '/html.git@00cd3c22dac0e68e6ed9e7e4945101aedb1b3109',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@3845753a54624b070828cb3eff7a6c2a4e046cfb',
+   Var('dart_git') + '/http.git@d5c678cd63c3e9c1d779a09acfa95b7e3af84665',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@e8c8be7f15b4fb50757ff5bf29766721fbe24fe4',
@@ -285,7 +287,7 @@ deps = {
    Var('dart_git') + '/shelf_static.git' + '@' + Var('dart_shelf_static_rev'),
 
   'src/third_party/dart/third_party/pkg/shelf_web_socket':
-   Var('dart_git') + '/shelf_web_socket.git@abae6956e2f7d863a416c99aa031d7fa1a7160a7',
+   Var('dart_git') + '/shelf_web_socket.git@bf8554ff80089bf88de262503f85dc3610d79ecf',
 
   'src/third_party/dart/third_party/pkg/source_map_stack_trace':
    Var('dart_git') + '/source_map_stack_trace.git@1c3026f69d9771acf2f8c176a1ab750463309cce',
@@ -339,7 +341,7 @@ deps = {
    Var('dart_git') + '/dart_style.git' + '@' + Var('dart_dart_style_tag'),
 
   'src/third_party/dart/third_party/pkg_tested/package_config':
-   Var('dart_git') + '/package_config.git@9c586d04bd26fef01215fd10e7ab96a3050cfa64',
+   Var('dart_git') + '/package_config.git@0e208cb5a9482d780c47627368d3f5bdc409f37b',
 
   'src/third_party/dart/tools/sdks':
    {'packages': [{'version': 'version:2.12.0-133.2.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
@@ -350,7 +352,7 @@ deps = {
    Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
 
   'src/third_party/freetype2':
-   Var('fuchsia_git') + '/third_party/freetype2' + '@' + 'edab12c07ac05d1185616688f338b1ad15936796',
+   Var('flutter_git') + '/third_party/freetype2' + '@' + '1f03c1b2d7f2ae832a4fbe9d12bd96c3c15bbece',
 
   'src/third_party/root_certificates':
    Var('dart_git') + '/root_certificates.git' + '@' + Var('dart_root_certificates_rev'),
@@ -384,9 +386,9 @@ deps = {
    Var('swiftshader_git') + '/SwiftShader.git' + '@' + '5d1e8540407c138f47028d64684f3da599430aa4',
 
    'src/third_party/angle':
-   Var('github_git') + '/google/angle.git' + '@' + 'ed90c9917b1b7fc6def319184b10609c11b2bd84',
+   Var('github_git') + '/google/angle.git' + '@' + 'ea0f3496436ec49f32576bba8d2c4c03467fbf96',
 
-   'src/third_party/angle/third_party/vulkan-headers/src':
+   'src/third_party/angle/third_party/vulkan-deps/vulkan-headers/src':
    Var('fuchsia_git') + '/third_party/Vulkan-Headers.git' + '@' + '5de4e8fab88ef0bd6994d9ddbcc864e3179b9e79',
 
    'src/third_party/abseil-cpp':
@@ -496,14 +498,27 @@ deps = {
     'dep_type': 'cipd',
   },
 
-  'src/buildtools/{host_os}-x64/clang': {
+  # Clang on mac and linux are expected to typically be the same revision.
+  # They are separated out so that the autoroller can more easily manage them.
+  'src/buildtools/mac-x64/clang': {
     'packages': [
       {
-        'package': 'fuchsia/third_party/clang/${{platform}}',
-        'version': 'git_revision:7e9747b50bcb1be28d4a3236571e8050835497a6'
+        'package': 'fuchsia/third_party/clang/mac-amd64',
+        'version': 'hoapl8VNWFGkiCI_tQDt_7wKgyaxie5bw_plTjO00T0C' 
       }
     ],
-    'condition': 'host_os == "mac" or host_os == "linux"',
+    'condition': 'host_os == "mac"',
+    'dep_type': 'cipd',
+  },
+
+  'src/buildtools/linux-x64/clang': {
+    'packages': [
+      {
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': '1Wa1KIWqFodI7MyWcK3V1py3mdLwYYWY2KOaeyIR-roC'
+      }
+    ],
+    'condition': 'host_os == "linux"',
     'dep_type': 'cipd',
   },
 
@@ -526,17 +541,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'BsUY1yjWhCqcChByDpKAtvZNMIPPDKfPcRA0TXaPGzQC'
-       }
-     ],
-     'condition': 'host_os == "mac"',
-     'dep_type': 'cipd',
-   },
-   'src/fuchsia/toolchain/mac': {
-     'packages': [
-       {
-        'package': 'fuchsia/clang/mac-amd64',
-        'version': 'OzTZOKkICT0yD82Dbx0jvVn5hN5eOSi6ByVTDseE7i0C'
+        'version': 'CZUusaxvkfuScuSTU0L5AuxpqOTJ_ijx9pesRK_FNg8C'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -546,17 +551,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'BUsKF6z4ts8QwjxV-C8yup92MEb6_G0DW6Y2SvEBJHQC'
-       }
-     ],
-     'condition': 'host_os == "linux"',
-     'dep_type': 'cipd',
-   },
-   'src/fuchsia/toolchain/linux': {
-     'packages': [
-       {
-        'package': 'fuchsia/clang/linux-amd64',
-        'version': 'OT6p30bQQhyCzRSy7xPsSbZ88J3PWOnneenkMZ0j7kIC'
+        'version': 'k80WkJhOLenOf4sEOX6dvr6UVZeQRR35ZGgfogku5_sC'
        }
      ],
      'condition': 'host_os == "linux"',

ci/licenses.sh

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