merge

Author: LongCatIsLooong

.cirrus.yml

@@ -62,19 +62,13 @@ task:
         ./txt_benchmarks --benchmark_format=json > txt_benchmarks.json
         ./fml_benchmarks --benchmark_format=json > fml_benchmarks.json
         ./shell_benchmarks --benchmark_format=json > shell_benchmarks.json
+        ./ui_benchmarks --benchmark_format=json > ui_benchmarks.json
         cd $ENGINE_PATH/src/flutter/testing/benchmark
         pub get
         dart bin/parse_and_send.dart ../../../out/host_release/txt_benchmarks.json
         dart bin/parse_and_send.dart ../../../out/host_release/fml_benchmarks.json
         dart bin/parse_and_send.dart ../../../out/host_release/shell_benchmarks.json
-    - name: build_and_test_linux_release
-      compile_host_script: |
-        cd $ENGINE_PATH/src
-        ./flutter/tools/gn --runtime-mode=release
-        ninja -C out/host_release
-      test_host_script: |
-        cd $ENGINE_PATH/src
-        ./flutter/testing/run_tests.sh host_release
+        dart bin/parse_and_send.dart ../../../out/host_release/ui_benchmarks.json
 
     # The following test depends on Flutter framework repo. It may fail if the
     # framework repo is currently broken.
@@ -125,24 +119,16 @@ task:
       script:
         - cd $ENGINE_PATH/src/flutter/lib/web_ui
         - $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
-        - $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dartanalyzer --fatal-warnings --fatal-hints dev/ lib/ test/ tool/
+        - $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dartanalyzer --enable-experiment=non-nullable --fatal-warnings --fatal-hints dev/ lib/ test/ tool/
 
-    - name: build_and_test_web_linux_firefox
-      compile_host_script: |
-        cd $ENGINE_PATH/src
-        ./flutter/tools/gn --unoptimized --full-dart-sdk
-        ninja -C out/host_debug_unopt
-      test_web_engine_firefox_script: |
-        cd $ENGINE_PATH/src/flutter/web_sdk/web_engine_tester
-        $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
-        cd $ENGINE_PATH/src/flutter/lib/web_ui
-        $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
-        export FELT="$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dart dev/felt.dart"
-        $FELT test --browser=firefox
     - name: format_and_dart_test
       format_script: |
         cd $ENGINE_PATH/src/flutter
         ./ci/format.sh
       build_script: |
         cd $ENGINE_PATH/src/flutter
         ./ci/build.sh
+    - name: lint_test
+      lint_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/ci/lint.sh

.clang-tidy

@@ -0,0 +1 @@
+Checks: 'google-*'

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,52 @@
+## Description
+
+*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.*
+
+## Related Issues
+
+*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.*
+
+## 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 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.
+
+## 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*
+
+<!-- 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
+[C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/master/CONTRIBUTING.md#style
+[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

.github/auto_assign.yml

@@ -17,7 +17,6 @@ reviewers:
   - GaryQian
   - jason-simmons
   - iskakaushik
-  - cbracken
   - flar
 
 # A number of reviewers added to the pull request

BUILD.gn

@@ -74,7 +74,6 @@ group("flutter") {
       "//flutter/lib/ui:ui_unittests",
       "//flutter/runtime:runtime_unittests",
       "//flutter/shell/common:shell_unittests",
-      "//flutter/shell/platform/android/external_view_embedder:android_external_view_embedder_unittests",
       "//flutter/shell/platform/embedder:embedder_unittests",
       "//flutter/testing:testing_unittests",
       "//flutter/third_party/txt:txt_unittests",
@@ -83,7 +82,10 @@ group("flutter") {
     if (!is_win) {
       public_deps += [
         "//flutter/fml:fml_benchmarks",
+        "//flutter/lib/ui:ui_benchmarks",
         "//flutter/shell/common:shell_benchmarks",
+        "//flutter/shell/platform/android/external_view_embedder:android_external_view_embedder_unittests",
+        "//flutter/shell/platform/android/jni:jni_unittests",
         "//flutter/third_party/txt:txt_benchmarks",
       ]
     }
@@ -123,6 +125,20 @@ config("config") {
   }
 }
 
+# This "fuchsia_legacy" configuration includes old, non-embedder API sources and
+# defines the LEGACY_FUCHSIA_EMBEDDER symbol.  This config and its associated
+# template are both transitional and will be removed after the embedder API
+# transition is complete.
+#
+# See `source_set_maybe_fuchsia_legacy` in //flutter/common/config.gni
+#
+# TODO(fxb/54041): Remove when no longer neccesary.
+config("fuchsia_legacy") {
+  if (is_fuchsia) {
+    defines = [ "LEGACY_FUCHSIA_EMBEDDER" ]
+  }
+}
+
 config("export_dynamic_symbols") {
   if (is_linux || is_fuchsia) {
     inputs = [
@@ -149,9 +165,12 @@ if (is_fuchsia) {
 
     deps = [
       "//flutter/flow:flow_tests",
+      "//flutter/flow:flow_tests_next",
       "//flutter/fml:fml_tests",
       "//flutter/runtime:runtime_tests",
+      "//flutter/runtime:runtime_tests_next",
       "//flutter/shell/common:shell_tests",
+      "//flutter/shell/common:shell_tests_next",
       "//flutter/shell/platform/fuchsia/flutter:flutter_runner_scenic_tests",
       "//flutter/shell/platform/fuchsia/flutter:flutter_runner_tests",
     ]

CONTRIBUTING.md

@@ -31,6 +31,7 @@ C++ and Objective-C/C++ files are formatted with `clang-format`, and GN files wi
 [contrib_guide]: https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md
 [engine_dev_setup]: https://github.com/flutter/flutter/wiki/Setting-up-the-Engine-development-environment
 
+
 ### Fuchsia Contributions from Googlers
 
 Googlers contributing to Fuchsia should follow the additional steps at: go/flutter-fuchsia-pr-policy.