Merge branch 'flutter:master' into add_virtual_method

Author: farchond

.cirrus.yml

@@ -50,7 +50,7 @@ task:
         mkdir -p bin/cache/pkg/
         cp -r $ENGINE_PATH/src/out/host_debug_unopt/gen/dart-pkg/sky_engine bin/cache/pkg/
         bin/flutter update-packages --local-engine=host_debug_unopt
-        bin/flutter analyze --dartdocs --flutter-repo --local-engine=host_debug_unopt
+        bin/flutter analyze --flutter-repo --local-engine=host_debug_unopt
       test_framework_script: |
         cd $FRAMEWORK_PATH/flutter/packages/flutter
         ../../bin/flutter test --local-engine=host_debug_unopt --null-assertions --sound-null-safety

BUILD.gn

@@ -52,8 +52,8 @@ group("flutter") {
 
   # Flutter SDK artifacts should only be built when either doing host builds, or
   # for cross-compiled desktop targets.
-  build_engine_artifacts =
-      current_toolchain == host_toolchain || (is_linux && !is_chromeos)
+  build_engine_artifacts = current_toolchain == host_toolchain ||
+                           (is_linux && !is_chromeos) || is_mac
 
   # If enbaled, compile the SDK / snapshot.
   if (!is_fuchsia) {
@@ -103,6 +103,7 @@ group("flutter") {
       "//flutter/flow:flow_unittests",
       "//flutter/fml:fml_unittests",
       "//flutter/lib/ui:ui_unittests",
+      "//flutter/runtime:no_dart_plugin_registrant_unittests",
       "//flutter/runtime:runtime_unittests",
       "//flutter/shell/common:shell_unittests",
       "//flutter/shell/platform/embedder:embedder_proctable_unittests",

CONTRIBUTING.md

@@ -23,7 +23,7 @@ The Flutter engine follows Google style for the languages it uses:
   - **Note**: The Linux embedding generally follows idiomatic GObject-based C style.
     Use of C++ is discouraged in that embedding to avoid creating hybrid code that
     feels unfamiliar to either developers used to working with GObject or C++ developers.
-    E.g., do not use STL collections or std::string. Exceptions:
+    For example, do not use STL collections or std::string. Exceptions:
       - C-style casts are forbidden; use C++ casts.
       - Use `nullptr` rather than `NULL`.
       - Avoid `#define`; for internal constants use `static constexpr` instead.

DEPS

@@ -27,26 +27,25 @@ vars = {
   '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': '988b7043e54cf725c864584bfda4d11bd103b473',
+  'skia_revision': 'adadb95a9f1ef21ccc5264c7d0bdc83b56cf91e9',
 
   # 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': '5fb4fb907f884627d0b22f4e573b3242957bba3b',
+  'dart_revision': 'b8f4018535fa792891e2add3a475f35e3ec156ab',
 
   # 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': '7322fc15cc065d8d2957fccce6b62a509dc4d641',
   'dart_boringssl_rev': '1607f54fed72c6589d560254626909a64124f091',
   'dart_clock_rev': 'a494269254ba978e7ef8f192c5f7fec3fc05b9d3',
   'dart_collection_rev': '9967dcd3d7645db6de48d5abfab3018bb0c84236',
-  'dart_dart_style_tag': '2cf810073e0cc7e7ea05d3de51830e6fa6d62924',
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.17.0-nullsafety',
-  'dart_linter_tag': '1.2.1',
+  'dart_linter_tag': '1.4.0',
   'dart_protobuf_rev': '0d03fd588df69e9863e2a2efc0059dee8f18d5b2',
   'dart_pub_rev': '0e657414a472e74ca5dd76ae0db50cc060251dec',
   'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
@@ -97,7 +96,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '33358ba597f875f6646522fd4ea86c1b31404d77',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '45ce223bc8d8ca88e2eb2f38eb0cf799e39edd06',
 
    # Fuchsia compatibility
    #
@@ -155,7 +154,7 @@ deps = {
    Var('dart_git') + '/args.git@d8fea36c10ef96797be02e3d132d572445cd86f4',
 
   'src/third_party/dart/third_party/pkg/async':
-   Var('dart_git') + '/async.git@376d418b1b535030fbe3369938d2ffdbb0340a77',
+   Var('dart_git') + '/async.git@cde00b89bd3c19e877b21de2c02282d4d311d0a5',
 
   'src/third_party/dart/third_party/pkg/bazel_worker':
    Var('dart_git') + '/bazel_worker.git@0885637b037979afbf5bcd05fd748b309fd669c0',
@@ -188,7 +187,7 @@ deps = {
    Var('dart_git') + '/dart2js_info.git@e0acfeb5affdf94c53067e68bd836adf589628fd',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@e2d010ed74059be942a78ced5f35f1b8d667ed16',
+   Var('dart_git') + '/dartdoc.git@505f163f7cb48e917503e4a23fbff1227e08b263',
 
   'src/third_party/dart/third_party/pkg/ffi':
    Var('dart_git') + '/ffi.git@f3346299c55669cc0db48afae85b8110088bf8da',
@@ -206,13 +205,13 @@ deps = {
    Var('dart_git') + '/html.git@00cd3c22dac0e68e6ed9e7e4945101aedb1b3109',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@615380db687d0649057ed8dba9d933d7d5f5051b',
+   Var('dart_git') + '/http.git@abb2bb182fbd7f03aafd1f889b902d7b3bdb8769',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@6bf4b6e5d4d890e6d54559b858ff229d79711171',
+   Var('dart_git') + '/http_multi_server.git@de1b312164c24a1690b46c6e97bd47eff40c4649',
 
   'src/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@5dd4d16693242049dfb43b5efa429fedbf932e98',
+   Var('dart_git') + '/http_parser.git@7720bfd42a0c096734c5213478fdce92c62f0293',
 
   'src/third_party/dart/third_party/pkg/http_retry':
    Var('dart_git') + '/http_retry.git@845771af7bb5ab38ab740ce4a31f3b0c7680302b',
@@ -224,7 +223,7 @@ deps = {
    Var('dart_git') + '/intl.git' + '@' + Var('dart_intl_tag'),
 
   'src/third_party/dart/third_party/pkg/json_rpc_2':
-   Var('dart_git') + '/json_rpc_2.git@b8dfe403fd8528fd14399dee3a6527b55802dd4d',
+   Var('dart_git') + '/json_rpc_2.git@5ec32a2e0e99dedcef5b3237f93167cd22c2da50',
 
   'src/third_party/dart/third_party/pkg/linter':
    Var('dart_git') + '/linter.git' + '@' + Var('dart_linter_tag'),
@@ -244,9 +243,6 @@ deps = {
   'src/third_party/dart/third_party/pkg/mockito':
    Var('dart_git') + '/mockito.git@d39ac507483b9891165e422ec98d9fb480037c8b',
 
-  'src/third_party/dart/third_party/pkg/mustache':
-   Var('dart_git') + '/external/github.com/xxgreg/mustache@664737ecad027e6b96d0d1e627257efa0e46fcb1',
-
   'src/third_party/dart/third_party/pkg/oauth2':
    Var('dart_git') + '/oauth2.git@7cd3284049fe5badbec9f2bea2afc41d14c01057',
 
@@ -272,7 +268,7 @@ deps = {
    Var('dart_git') + '/resource.git' + '@' + Var('dart_resource_rev'),
 
   'src/third_party/dart/third_party/pkg/shelf':
-   Var('dart_git') + '/shelf.git@00e50adfb776602c25942a99d89f8704cc20db9c',
+   Var('dart_git') + '/shelf.git@4b9294e29eb308709444a5c0b890fa8ccd69fae4',
 
   'src/third_party/dart/third_party/pkg/shelf_packages_handler':
    Var('dart_git') + '/shelf_packages_handler.git@78302e67c035047e6348e692b0c1182131f0fe35',
@@ -311,7 +307,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@6a0f9b6fb645ba75e7a00a4e20072678327a0347',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@e673623f45d75ccec750d35271b0b4d1423e9fac',
+   Var('dart_git') + '/test.git@433f1d8726f9c1484007588470b17830a5e97a12',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@54e930a11c372683792e22bddad79197728c91ce',
@@ -326,13 +322,13 @@ deps = {
    Var('dart_git') + '/watcher.git' + '@' + Var('dart_watcher_rev'),
 
   'src/third_party/dart/third_party/pkg/web_socket_channel':
-   Var('dart_git') + '/web_socket_channel.git@d3e100de8feb0283a04732366bb591ebd2282d7d',
+   Var('dart_git') + '/web_socket_channel.git@6448ce532445a8a458fa191d9346df071ae0acad',
 
   'src/third_party/dart/third_party/pkg/yaml':
    Var('dart_git') + '/yaml.git@b4c4411631bda556ce9a45af1ab0eecaf9f3ac53',
 
   'src/third_party/dart/third_party/pkg_tested/dart_style':
-   Var('dart_git') + '/dart_style.git' + '@' + Var('dart_dart_style_tag'),
+   Var('dart_git') + '/dart_style.git@f17c23e0eea9a870601c19d904e2a9c1a7c81470',
 
   'src/third_party/dart/third_party/pkg_tested/package_config':
    Var('dart_git') + '/package_config.git@a84c0d45401f215fbe9384df923a38f4022a3c45',
@@ -345,6 +341,9 @@ deps = {
   'src/third_party/colorama/src':
    Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
 
+  'src/third_party/expat':
+   Var('flutter_git') + '/third_party/expat' + '@' + '1441fc5252746e53b285d15be7e65e4cd74d97eb',
+
   'src/third_party/freetype2':
    Var('flutter_git') + '/third_party/freetype2' + '@' + '1f03c1b2d7f2ae832a4fbe9d12bd96c3c15bbece',
 
@@ -361,7 +360,7 @@ deps = {
    Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
   'src/third_party/libpng':
-   Var('flutter_git') + '/third_party/libpng' + '@' + 'f46faec244dbda5f1d2a5bc370cf83125d6ffab1',
+   Var('flutter_git') + '/third_party/libpng' + '@' + 'afda123a503bdc41df13f86316cf5f83bc204761',
 
   'src/third_party/libwebp':
    Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0',
@@ -501,7 +500,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/mac-amd64',
-        'version': 'GUX2BsVIcrK9YuAZuavDsApm-5Mzaur2heo7DRsH8rQC'
+        'version': 'bf4GDBSQEjRrv9-8G-pOt4fZqohuxEKEr4F6Gic7JRsC'
       }
     ],
     'condition': 'host_os == "mac"',
@@ -512,7 +511,7 @@ deps = {
     'packages': [
       {
         'package': 'fuchsia/third_party/clang/linux-amd64',
-        'version': 'TEHg3vhDG4veysl3QZ0KqkSv00Emiai-CTZXMTFJfqQC'
+        'version': 'zRvL_ACCGLlvQyyLi6bT_5kSLvVhxlGr3sepp98wsqAC'
       }
     ],
     'condition': 'host_os == "linux"',
@@ -538,7 +537,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'VFHTytszrSkNokXL1Rc9L7k-_cOwezdPKdXrxSzbnEgC'
+        'version': 'uQgs5ZmFqGbZ6sZiLo5xCug5EzVsRqfvxYNOD2dE9jYC'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -548,7 +547,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'kafCPE8Hde3ZVlWxogcQWVvMhIfbWhXmUryNPd2chjcC'
+        'version': '4numS0K6TAgTzLt_Y7F8xzrU2jhmR651iTLmjQaoN9oC'
        }
      ],
      'condition': 'host_os == "linux"',

README.md

@@ -33,3 +33,4 @@ Information on how to get started can be found at our
 
 [Build status]: https://cirrus-ci.com/github/flutter/engine
 
+

assets/asset_manager.cc

@@ -77,15 +77,16 @@ std::unique_ptr<fml::Mapping> AssetManager::GetAsMapping(
 
 // |AssetResolver|
 std::vector<std::unique_ptr<fml::Mapping>> AssetManager::GetAsMappings(
-    const std::string& asset_pattern) const {
+    const std::string& asset_pattern,
+    const std::optional<std::string>& subdir) const {
   std::vector<std::unique_ptr<fml::Mapping>> mappings;
   if (asset_pattern.size() == 0) {
     return mappings;
   }
   TRACE_EVENT1("flutter", "AssetManager::GetAsMappings", "pattern",
                asset_pattern.c_str());
   for (const auto& resolver : resolvers_) {
-    auto resolver_mappings = resolver->GetAsMappings(asset_pattern);
+    auto resolver_mappings = resolver->GetAsMappings(asset_pattern, subdir);
     mappings.insert(mappings.end(),
                     std::make_move_iterator(resolver_mappings.begin()),
                     std::make_move_iterator(resolver_mappings.end()));

assets/asset_manager.h

@@ -9,6 +9,7 @@
 #include <memory>
 #include <string>
 
+#include <optional>
 #include "flutter/assets/asset_resolver.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
@@ -70,7 +71,8 @@ class AssetManager final : public AssetResolver {
 
   // |AssetResolver|
   std::vector<std::unique_ptr<fml::Mapping>> GetAsMappings(
-      const std::string& asset_pattern) const override;
+      const std::string& asset_pattern,
+      const std::optional<std::string>& subdir) const override;
 
  private:
   std::deque<std::unique_ptr<AssetResolver>> resolvers_;

assets/asset_resolver.h

@@ -8,6 +8,7 @@
 #include <string>
 #include <vector>
 
+#include <optional>
 #include "flutter/fml/macros.h"
 #include "flutter/fml/mapping.h"
 
@@ -59,10 +60,24 @@ class AssetResolver {
   [[nodiscard]] virtual std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const = 0;
 
-  // Same as GetAsMapping() but returns mappings for all files who's name
-  // matches |pattern|. Returns empty vector if no matching assets are found
+  //--------------------------------------------------------------------------
+  /// @brief      Same as GetAsMapping() but returns mappings for all files
+  ///             who's name matches a given pattern. Returns empty vector
+  ///             if no matching assets are found.
+  ///
+  /// @param[in]  asset_pattern  The pattern to match file names against.
+  ///
+  /// @param[in]  subdir  Optional subdirectory in which to search for files.
+  ///             If supplied this function does a flat search within the
+  ///             subdirectory instead of a recursive search through the entire
+  ///             assets directory.
+  ///
+  /// @return     Returns a vector of mappings of files which match the search
+  ///             parameters.
+  ///
   [[nodiscard]] virtual std::vector<std::unique_ptr<fml::Mapping>>
-  GetAsMappings(const std::string& asset_pattern) const {
+  GetAsMappings(const std::string& asset_pattern,
+                const std::optional<std::string>& subdir) const {
     return {};
   };
 

assets/directory_asset_bundle.cc

@@ -10,6 +10,7 @@
 #include "flutter/fml/eintr_wrapper.h"
 #include "flutter/fml/file.h"
 #include "flutter/fml/mapping.h"
+#include "flutter/fml/trace_event.h"
 
 namespace flutter {
 
@@ -60,7 +61,8 @@ std::unique_ptr<fml::Mapping> DirectoryAssetBundle::GetAsMapping(
 }
 
 std::vector<std::unique_ptr<fml::Mapping>> DirectoryAssetBundle::GetAsMappings(
-    const std::string& asset_pattern) const {
+    const std::string& asset_pattern,
+    const std::optional<std::string>& subdir) const {
   std::vector<std::unique_ptr<fml::Mapping>> mappings;
   if (!is_valid_) {
     FML_DLOG(WARNING) << "Asset bundle was not valid.";
@@ -70,9 +72,19 @@ std::vector<std::unique_ptr<fml::Mapping>> DirectoryAssetBundle::GetAsMappings(
   std::regex asset_regex(asset_pattern);
   fml::FileVisitor visitor = [&](const fml::UniqueFD& directory,
                                  const std::string& filename) {
+    TRACE_EVENT0("flutter", "DirectoryAssetBundle::GetAsMappings FileVisitor");
+
     if (std::regex_match(filename, asset_regex)) {
-      auto mapping = std::make_unique<fml::FileMapping>(fml::OpenFile(
-          directory, filename.c_str(), false, fml::FilePermission::kRead));
+      TRACE_EVENT0("flutter", "Matched File");
+
+      fml::UniqueFD fd = fml::OpenFile(directory, filename.c_str(), false,
+                                       fml::FilePermission::kRead);
+
+      if (fml::IsDirectory(fd)) {
+        return true;
+      }
+
+      auto mapping = std::make_unique<fml::FileMapping>(fd);
 
       if (mapping && mapping->IsValid()) {
         mappings.push_back(std::move(mapping));
@@ -82,7 +94,18 @@ std::vector<std::unique_ptr<fml::Mapping>> DirectoryAssetBundle::GetAsMappings(
     }
     return true;
   };
-  fml::VisitFilesRecursively(descriptor_, visitor);
+  if (!subdir) {
+    fml::VisitFilesRecursively(descriptor_, visitor);
+  } else {
+    fml::UniqueFD subdir_fd =
+        fml::OpenFileReadOnly(descriptor_, subdir.value().c_str());
+    if (!fml::IsDirectory(subdir_fd)) {
+      FML_LOG(ERROR) << "Subdirectory path " << subdir.value()
+                     << " is not a directory";
+      return mappings;
+    }
+    fml::VisitFiles(subdir_fd, visitor);
+  }
 
   return mappings;
 }

assets/directory_asset_bundle.h

@@ -5,6 +5,7 @@
 #ifndef FLUTTER_ASSETS_DIRECTORY_ASSET_BUNDLE_H_
 #define FLUTTER_ASSETS_DIRECTORY_ASSET_BUNDLE_H_
 
+#include <optional>
 #include "flutter/assets/asset_resolver.h"
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/ref_counted.h"
@@ -39,7 +40,8 @@ class DirectoryAssetBundle : public AssetResolver {
 
   // |AssetResolver|
   std::vector<std::unique_ptr<fml::Mapping>> GetAsMappings(
-      const std::string& asset_pattern) const override;
+      const std::string& asset_pattern,
+      const std::optional<std::string>& subdir) const override;
 
   FML_DISALLOW_COPY_AND_ASSIGN(DirectoryAssetBundle);
 };