chriscraws · chriscraws · Oct 22, 2020 · Oct 7, 2020 · Oct 7, 2020 · Oct 7, 2020
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -74,4 +74,4 @@ task:
         bin/flutter analyze --dartdocs --flutter-repo --local-engine=host_debug_unopt
       test_framework_script: |
         cd $FRAMEWORK_PATH/flutter/packages/flutter
-        ../../bin/flutter test --local-engine=host_debug_unopt
+        ../../bin/flutter test --local-engine=host_debug_unopt --null-assertions --sound-null-safety --enable-experiment=non-nullable
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -32,6 +32,12 @@ Before you create this PR confirm that it meets all requirements listed below by
 - [ ] All existing and new tests are passing.
 - [ ] I am willing to follow-up on review comments in a timely manner.
 
+
+## Reviewer Checklist
+
+- [ ] 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].
@@ -50,3 +56,4 @@ Did any tests fail when you ran them? Please read [handling breaking changes].
 [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
+[engine presubmit flakes form]: https://forms.gle/Wc1VyFRYJjQTH6w5A
diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,11 +20,18 @@ contributing guide.
 
 The Flutter engine follows Google style for the languages it uses:
 - [C++](https://google.github.io/styleguide/cppguide.html)
+  - **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:
+      - C-style casts are forbidden; use C++ casts.
+      - Use `nullptr` rather than `NULL`.
+      - Avoid `#define`; for internal constants use `static constexpr` instead.
 - [Objective-C](https://google.github.io/styleguide/objcguide.html) (including
   [Objective-C++](https://google.github.io/styleguide/objcguide.html#objective-c))
 - [Java](https://google.github.io/styleguide/javaguide.html)
 
-C++ and Objective-C/C++ files are formatted with `clang-format`, and GN files with `gn format`.
+C/C++ and Objective-C/C++ files are formatted with `clang-format`, and GN files with `gn format`.
 
 [build_status]: https://cirrus-ci.com/github/flutter/engine
 [code_of_conduct]: https://github.com/flutter/flutter/blob/master/CODE_OF_CONDUCT.md

diff --git a/DEPS b/DEPS
@@ -26,47 +26,47 @@ 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': 'a7f69c290667bb969788e014e3308cef6e187740',
+  'skia_revision': '5c7bb326a7b3015d36a86094f54e272c787f721b',
 
   # 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': '9560a32779fc966349dd2d719b76aee49fb6a1de',
+  'dart_revision': 'a3d902d8598eabf68db42c6f7911fb7fb63f7012',
 
   # 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_args_tag': '1.6.0',
   'dart_boringssl_gen_rev': '429ccb1877f7987a6f3988228bc2440e61293499',
   'dart_boringssl_rev': '4dfd5af70191b068aebe567b8e29ce108cee85ce',
-  'dart_collection_rev': '52e219581f72a3eac013d6f5550c580962677425',
+  'dart_collection_rev': '7d44763d62f97698b15c08ee360d838dccb63c88',
   'dart_dart_style_tag': '1.3.7',
   'dart_http_retry_tag': '0.1.1',
   'dart_http_throttle_tag': '1.0.2',
   'dart_intl_tag': '0.16.1',
-  'dart_linter_tag': '0.1.120',
+  'dart_linter_tag': '0.1.121',
   'dart_oauth2_tag': '1.6.0',
   'dart_protobuf_rev': '3746c8fd3f2b0147623a8e3db89c3ff4330de760',
-  'dart_pub_rev': '04e237f78b2302d7f20d0b362554425e8deb8add',
+  'dart_pub_rev': 'f0c7771b38155d3829a60d60b5dba2784b100811',
   'dart_pub_semver_tag': 'v1.4.4',
   'dart_quiver-dart_tag': '246e754fe45cecb6aa5f3f13b4ed61037ff0d784',
-  'dart_resource_rev': 'f8e37558a1c4f54550aa463b88a6a831e3e33cd6',
+  'dart_resource_rev': '6b79867d0becf5395e5819a75720963b8298e9a7',
   'dart_root_certificates_rev': '7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8',
   'dart_shelf_packages_handler_tag': '2.0.0',
   'dart_shelf_proxy_tag': '0.1.0+7',
   'dart_shelf_static_rev': 'v0.2.8',
   'dart_shelf_web_socket_tag': '0.2.2+3',
   'dart_sse_tag': 'e5cf68975e8e87171a3dc297577aa073454a91dc',
-  'dart_stack_trace_tag': 'a958966148516dfa64e2b54c14492175da5cc8e1',
+  'dart_stack_trace_tag': '45319bfd2a6da228d8c32b06e1da02ad199373c7',
   'dart_stagehand_tag': 'v3.3.9',
   'dart_stream_channel_tag': 'c446774fd077c9bdbd6235a7aadc661ef60a9727',
   'dart_test_reflective_loader_tag': '0.1.9',
-  'dart_tflite_native_rev': '3c777c40608a2a9f1427bfe0028ab48e7116b4c1',
+  'dart_tflite_native_rev': '0.4.0+1',
   'dart_typed_data_tag': 'f94fc57b8e8c0e4fe4ff6cfd8290b94af52d3719',
   'dart_usage_tag': '3.4.0',
-  'dart_watcher_rev': 'fc3c9aae5d31d707b3013b42634dde8d8a1161b4',
+  'dart_watcher_rev': '5df2e364b0c3ec12b9ed9cf2eedb71f9ddf8b7cd',
 
   'ocmock_tag': 'v3.7.1',
 
@@ -105,7 +105,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f83d1d75216e97fb696434bca1cb9a4e7a570fb6',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '9184ff0695be1b3e4bb20cf64efcfa56daa0a3c0',
 
    # Fuchsia compatibility
    #
@@ -143,7 +143,7 @@ deps = {
    Var('chromium_git') + '/chromium/src/ios.git' + '@' + Var('ios_tools_revision'),
 
   'src/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '8d29692df640668ed7e4d1817715440c4e05697a',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '146cb611fb2c1f53e63c2e59bd735d7a8ac6ec8c',
 
   'src/third_party/khronos':
    Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275',
@@ -175,7 +175,7 @@ deps = {
    Var('dart_git') + '/charcode.git@4a685faba42d86ebd9d661eadd1e79d0a1c34c43',
 
   'src/third_party/dart/third_party/pkg/cli_util':
-   Var('dart_git') + '/cli_util.git@0.2.0',
+   Var('dart_git') + '/cli_util.git@335ed165887d0ec97c2a09173ebf22dcf56a6c4e',
 
   'src/third_party/dart/third_party/pkg/collection':
    Var('dart_git') + '/collection.git' + '@' + Var('dart_collection_rev'),
@@ -193,10 +193,10 @@ deps = {
    Var('dart_git') + '/dart2js_info.git@0632a623b08e1f601c7eba99e0186a581ae799e9',
 
   'src/third_party/dart/third_party/pkg/dartdoc':
-   Var('dart_git') + '/dartdoc.git@2bef0f260594b822f55c8c8f777d9c4c1ea8f76c',
+   Var('dart_git') + '/dartdoc.git@8f5f30e58bbc0f11f104888ee87f11cbd6b82cc7',
 
   'src/third_party/dart/third_party/pkg/ffi':
-   Var('dart_git') + '/ffi.git@454ab0f9ea6bd06942a983238d8a6818b1357edb',
+   Var('dart_git') + '/ffi.git@a90bd424116fb6f416337db67425171f2dc4c98f',
 
   'src/third_party/dart/third_party/pkg/fixnum':
    Var('dart_git') + '/fixnum.git@16d3890c6dc82ca629659da1934e412292508bba',
@@ -208,13 +208,13 @@ deps = {
    Var('dart_git') + '/html.git@22f17e97fedeacaa1e945cf84d8016284eed33a6',
 
   'src/third_party/dart/third_party/pkg/http':
-   Var('dart_git') + '/http.git@ca418355b5fc60cf981de3bd7364ec0dd943fa8f',
+   Var('dart_git') + '/http.git@20e3a594872ae1565249c7cfc8977f9a10ca9927',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
    Var('dart_git') + '/http_multi_server.git@ea269f79321d659208402088f3297e8920a88ee6',
 
   'src/third_party/dart/third_party/pkg/http_parser':
-   Var('dart_git') + '/http_parser.git@6e63a97b5aaa2b4d1215fe01683e51fb73258e54',
+   Var('dart_git') + '/http_parser.git@5dd4d16693242049dfb43b5efa429fedbf932e98',
 
   'src/third_party/dart/third_party/pkg/http_retry':
    Var('dart_git') + '/http_retry.git' + '@' + Var('dart_http_retry_tag'),
@@ -232,10 +232,10 @@ deps = {
    Var('dart_git') + '/linter.git' + '@' + Var('dart_linter_tag'),
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@1590ba0b648a51e7eb3895c612e4b72f72623b6f',
+   Var('dart_git') + '/logging.git@9d2a7fdd05b09bc06474881152b5baaf38fd1329',
 
   'src/third_party/dart/third_party/pkg/markdown':
-   Var('dart_git') + '/markdown.git@dbeafd47759e7dd0a167602153bb9c49fb5e5fe7',
+   Var('dart_git') + '/markdown.git@6f89681d59541ddb1cf3a58efbdaa2304ffc3f51',
 
   'src/third_party/dart/third_party/pkg/matcher':
    Var('dart_git') + '/matcher.git@9cae8faa7868bf3a88a7ba45eb0bd128e66ac515',
@@ -349,7 +349,7 @@ deps = {
    Var('dart_git') + '/package_config.git@9c586d04bd26fef01215fd10e7ab96a3050cfa64',
 
   'src/third_party/dart/tools/sdks':
-   {'packages': [{'version': 'version:2.10.0-110.3.beta', 'package': 'dart/dart-sdk/${{platform}}'}], 'dep_type': 'cipd'},
+   {'packages': [{'version': 'version:2.11.0-190.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.
 
@@ -522,7 +522,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/mac-amd64',
-        'version': 'm6w8tDXMmHQL489ST4B5AUN5EgLI4SfaptN1uq7rHk4C'
+        'version': 'WLxBkBnZaNoU9jUg-hJISRzU7ypNG7hHa5RaOKH3dx4C'
        }
      ],
      'condition': 'host_os == "mac"',
@@ -542,7 +542,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'kr1tNtZvZ94LI14n82Mp5cR_xcAMiUcoCSJoCEkHPDsC'
+        'version': 'gqS_DIjN4Qc6rrMPDMuxaVmIfaJwUEH2ofE363gthpwC'
        }
      ],
      'condition': 'host_os == "linux"',

diff --git a/assets/asset_manager.cc b/assets/asset_manager.cc
@@ -29,6 +29,10 @@ void AssetManager::PushBack(std::unique_ptr<AssetResolver> resolver) {
   resolvers_.push_back(std::move(resolver));
 }
 
+std::deque<std::unique_ptr<AssetResolver>> AssetManager::TakeResolvers() {
+  return std::move(resolvers_);
+}
+
 // |AssetResolver|
 std::unique_ptr<fml::Mapping> AssetManager::GetAsMapping(
     const std::string& asset_name) const {
@@ -52,4 +56,9 @@ bool AssetManager::IsValid() const {
   return resolvers_.size() > 0;
 }
 
+// |AssetResolver|
+bool AssetManager::IsValidAfterAssetManagerChange() const {
+  return false;
+}
+
 }  // namespace flutter
diff --git a/assets/asset_manager.h b/assets/asset_manager.h
@@ -25,9 +25,14 @@ class AssetManager final : public AssetResolver {
 
   void PushBack(std::unique_ptr<AssetResolver> resolver);
 
+  std::deque<std::unique_ptr<AssetResolver>> TakeResolvers();
+
   // |AssetResolver|
   bool IsValid() const override;
 
+  // |AssetResolver|
+  bool IsValidAfterAssetManagerChange() const override;
+
   // |AssetResolver|
   std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const override;

diff --git a/assets/asset_resolver.h b/assets/asset_resolver.h
@@ -21,6 +21,24 @@ class AssetResolver {
 
   virtual bool IsValid() const = 0;
 
+  //----------------------------------------------------------------------------
+  /// @brief      Certain asset resolvers are still valid after the asset
+  ///             manager is replaced before a hot reload, or after a new run
+  ///             configuration is created during a hot restart. By preserving
+  ///             these resolvers and re-inserting them into the new resolver or
+  ///             run configuration, the tooling can avoid needing to sync all
+  ///             application assets through the Dart devFS upon connecting to
+  ///             the VM Service. Besides improving the startup performance of
+  ///             running a Flutter application, it also reduces the occurance
+  ///             of tool failures due to repeated network flakes caused by
+  ///             damaged cables or hereto unknown bugs in the Dart HTTP server
+  ///             implementation.
+  ///
+  /// @return     Returns whether this resolver is valid after the asset manager
+  ///             or run configuration is updated.
+  ///
+  virtual bool IsValidAfterAssetManagerChange() const = 0;
+
   [[nodiscard]] virtual std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const = 0;
 

diff --git a/assets/directory_asset_bundle.cc b/assets/directory_asset_bundle.cc
@@ -12,11 +12,14 @@
 
 namespace flutter {
 
-DirectoryAssetBundle::DirectoryAssetBundle(fml::UniqueFD descriptor)
+DirectoryAssetBundle::DirectoryAssetBundle(
+    fml::UniqueFD descriptor,
+    bool is_valid_after_asset_manager_change)
     : descriptor_(std::move(descriptor)) {
   if (!fml::IsDirectory(descriptor_)) {
     return;
   }
+  is_valid_after_asset_manager_change_ = is_valid_after_asset_manager_change;
   is_valid_ = true;
 }
 
@@ -27,6 +30,11 @@ bool DirectoryAssetBundle::IsValid() const {
   return is_valid_;
 }
 
+// |AssetResolver|
+bool DirectoryAssetBundle::IsValidAfterAssetManagerChange() const {
+  return is_valid_after_asset_manager_change_;
+}
+
 // |AssetResolver|
 std::unique_ptr<fml::Mapping> DirectoryAssetBundle::GetAsMapping(
     const std::string& asset_name) const {

diff --git a/assets/directory_asset_bundle.h b/assets/directory_asset_bundle.h
@@ -14,17 +14,22 @@ namespace flutter {
 
 class DirectoryAssetBundle : public AssetResolver {
  public:
-  explicit DirectoryAssetBundle(fml::UniqueFD descriptor);
+  DirectoryAssetBundle(fml::UniqueFD descriptor,
+                       bool is_valid_after_asset_manager_change);
 
   ~DirectoryAssetBundle() override;
 
  private:
   const fml::UniqueFD descriptor_;
   bool is_valid_ = false;
+  bool is_valid_after_asset_manager_change_ = false;
 
   // |AssetResolver|
   bool IsValid() const override;
 
+  // |AssetResolver|
+  bool IsValidAfterAssetManagerChange() const override;
+
   // |AssetResolver|
   std::unique_ptr<fml::Mapping> GetAsMapping(
       const std::string& asset_name) const override;

diff --git a/ci/analyze.sh b/ci/analyze.sh
@@ -59,6 +59,7 @@ function analyze() (
 )
 
 echo "Analyzing dart:ui library..."
+autoninja -C "$SRC_DIR/out/host_debug_unopt" generate_dart_ui
 analyze \
   --options "$FLUTTER_DIR/analysis_options.yaml" \
   --enable-experiment=non-nullable \
@@ -79,7 +80,7 @@ analyze \
 
 echo "Analyzing testing/dart..."
 "$FLUTTER_DIR/tools/gn" --unoptimized
-ninja -C "$SRC_DIR/out/host_debug_unopt" sky_engine sky_services
+autoninja -C "$SRC_DIR/out/host_debug_unopt" sky_engine sky_services
 (cd "$FLUTTER_DIR/testing/dart" && "$PUB" get)
 analyze \
   --packages="$FLUTTER_DIR/testing/dart/.dart_tool/package_config.json" \