Merge branch 'master' of https://github.com/flutter/engine into tanay/gif-insertion-pr

� Conflicts:
�	DEPS
�	ci/licenses_golden/licenses_third_party
�	flow/layers/container_layer.cc
�	flow/layers/layer.cc
�	flow/layers/layer.h
�	flow/layers/platform_view_layer_unittests.cc
�	lib/web_ui/lib/src/engine/canvaskit/embedded_views.dart
�	lib/web_ui/lib/src/engine/semantics/semantics.dart
�	lib/web_ui/lib/src/engine/semantics/text_field.dart
�	lib/web_ui/lib/src/engine/text_editing/text_editing.dart
�	lib/web_ui/test/canvaskit/common.dart
�	lib/web_ui/test/canvaskit/embedded_views_test.dart
�	lib/web_ui/test/engine/semantics/semantics_tester.dart
�	lib/web_ui/test/engine/semantics/text_field_test.dart
�	lib/web_ui/test/text_editing_test.dart
�	runtime/dart_isolate.cc
�	shell/platform/android/io/flutter/plugin/editing/InputConnectionAdaptor.java
�	testing/dart_isolate_runner.cc
�	third_party/tonic/tests/dart_persistent_handle_unittest.cc

Author: tneotia

.ci.yaml

@@ -0,0 +1,321 @@
+# Describes the targets run in continuous integration environment.
+#
+# Flutter infra uses this file to generate a checklist of tasks to be performed
+# for every commit.
+#
+# More information at:
+#  * https://github.com/flutter/cocoon/blob/master/CI_YAML.md
+enabled_branches:
+  - master
+  - dev
+  - beta
+  - stable
+
+platform_properties:
+  linux:
+    properties:
+      caches: >-
+        [
+          {"name":"builder_linux_engine","path":"builder"},
+          {"name":"openjdk","path":"java"}
+        ]
+      dependencies: >-
+        [
+          # CIPD flutter_internal/java/openjdk/$platform
+          {"dependency": "openjdk", "version": "1.8.0u202-b08"}
+        ]
+      os: Linux
+  mac:
+    properties:
+      caches: >-
+        [
+          {"name":"flutter_cocoapods","path":"cocoapods"},
+          {"name":"old_osx_sdk","path":"osx_sdk"},
+          {"name":"builder_mac_engine","path":"builder"},
+          {"name":"openjdk","path":"java"}
+        ]
+      dependencies: >-
+        [
+          # CIPD flutter_internal/java/openjdk/$platform
+          {"dependency": "openjdk", "version": "1.8.0u202-b08"}
+        ]
+      os: Mac-10.15
+      xcode: 12a7209 # xcode 12
+  windows:
+    properties:
+      caches: >-
+        [
+          {"name":"builder_win_engine","path":"builder"},
+          {"name":"openjdk","path":"java"}
+        ]
+      dependencies: >-
+        [
+          # CIPD flutter_internal/java/openjdk/$platform
+          {"dependency": "openjdk", "version": "1.8.0u202-b08"}
+        ]
+      os: Windows-10
+
+targets:
+  - name: Linux Android AOT Engine
+    builder: Linux Android AOT Engine
+    recipe: engine
+    properties:
+      add_recipes_cq: "true"
+      build_android_aot: "true"
+      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
+      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Android Debug Engine
+    builder: Linux Android Debug Engine
+    recipe: engine
+    properties:
+      add_recipes_cq: "true"
+      build_android_debug: "true"
+      build_android_jit_release: "true"
+      build_android_vulkan: "true"
+      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
+      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Android Scenarios
+    builder: Linux Android Scenarios
+    bringup: true # Recipe issue https://github.com/flutter/flutter/issues/86427
+    recipe: engine/scenarios
+    properties:
+      upload_packages: "true"
+      clobber: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Benchmarks
+    builder: Linux Benchmarks
+    enabled_branches:
+      - master
+    recipe: engine/engine_metrics
+    presubmit: false
+    properties:
+      build_host: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Fuchsia
+    builder: Linux Fuchsia
+    recipe: engine
+    properties:
+      add_recipes_cq: "true"
+      build_fuchsia: "true"
+      fuchsia_ctl_version: version:0.0.27
+    timeout: 90
+    scheduler: luci
+
+  - name: Linux Fuchsia FEMU
+    builder: Linux Fuchsia FEMU
+    recipe: femu_test
+    properties:
+      add_recipes_cq: "true"
+      build_fuchsia: "true"
+      fuchsia_ctl_version: version:0.0.27
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Framework Smoke Tests
+    builder: Linux Framework Smoke Tests
+    recipe: engine/framework_smoke
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Host Engine
+    builder: Linux Host Engine
+    recipe: engine
+    properties:
+      add_recipes_cq: "true"
+      build_host: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Unopt
+    builder: Linux Unopt
+    recipe: engine_unopt
+    properties:
+      add_recipes_cq: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Linux Arm Host Engine
+    builder: Linux Arm Host Engine
+    recipe: engine/engine_arm
+    properties:
+      add_recipes_cq: "true"
+      build_host: "true"
+    timeout: 90
+    scheduler: luci
+
+  - name: Linux Web Engine
+    builder: Linux Web Engine
+    recipe: web_engine
+    properties:
+      add_recipes_cq: "true"
+      gcs_goldens_bucket: flutter_logs
+    timeout: 60
+    scheduler: luci
+    runIf:
+      - DEPS
+      - lib/web_ui/**
+      - web_sdk/**
+      - tools/**
+      - ci/**
+      - flutter_frontend_server/**
+
+  - name: Linux Web Framework tests
+    builder: Linux Web Framework tests
+    recipe: engine/web_engine_framework
+    properties:
+      add_recipes_cq: "true"
+      framework: "true"
+      shard: web_tests
+      subshards: >-
+              ["0", "1", "2", "3", "4", "5", "6", "7_last"]
+    timeout: 60
+    scheduler: luci
+    runIf:
+      - DEPS
+      - lib/web_ui/**
+      - web_sdk/**
+      - tools/**
+      - ci/**
+      - flutter_frontend_server/**
+
+  - name: Mac Android AOT Engine
+    builder: Mac Android AOT Engine
+    recipe: engine
+    properties:
+      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
+      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
+      build_android_aot: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Mac Android Debug Engine
+    builder: Mac Android Debug Engine
+    recipe: engine
+    properties:
+      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
+      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
+      build_android_debug: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Mac Host Engine
+    builder: Mac Host Engine
+    recipe: engine
+    properties:
+      add_recipes_cq: "true"
+      build_host: "true"
+    timeout: 75
+    scheduler: luci
+
+  - name: Mac Unopt
+    builder: Mac Unopt
+    recipe: engine_unopt
+    properties:
+      add_recipes_cq: "true"
+      jazzy_version: 0.9.5
+    timeout: 75
+    scheduler: luci
+
+  - name: Mac iOS Engine
+    builder: Mac iOS Engine
+    recipe: engine
+    properties:
+      build_ios: "true"
+      ios_debug: "true"
+      jazzy_version: 0.9.5
+    timeout: 60
+    scheduler: luci
+
+  - name: Mac Web Engine
+    builder: Mac Web Engine
+    recipe: web_engine
+    properties:
+      gcs_goldens_bucket: flutter_logs
+    timeout: 60
+    scheduler: luci
+    runIf:
+      - DEPS
+      - lib/web_ui/**
+      - web_sdk/**
+      - tools/**
+      - ci/**
+      - flutter_frontend_server/**
+
+  - name: Windows Android AOT Engine
+    builder: Windows Android AOT Engine
+    recipe: engine
+    properties:
+      build_android_aot: "true"
+      android_sdk_license: \n24333f8a63b6825ea9c5514f83c2829b004d1fee
+      android_sdk_preview_license: \n84831b9409646a918e30573bab4c9c91346d8abd
+    timeout: 60
+    scheduler: luci
+
+  - name: Windows Host Engine
+    builder: Windows Host Engine
+    recipe: engine
+    timeout: 60
+    properties:
+      add_recipes_cq: "true"
+      build_host: "true"
+    scheduler: luci
+
+  - name: Windows Unopt
+    builder: Windows Unopt
+    recipe: engine_unopt
+    properties:
+      add_recipes_cq: "true"
+    timeout: 75
+    scheduler: luci
+
+  - name: Windows UWP Engine
+    builder: Windows UWP Engine
+    recipe: engine
+    properties:
+      build_windows_uwp: "true"
+    timeout: 60
+    scheduler: luci
+
+  - name: Windows Web Engine
+    builder: Windows Web Engine
+    recipe: web_engine
+    properties:
+      gcs_goldens_bucket: flutter_logs
+    timeout: 60
+    scheduler: luci
+    runIf:
+      - DEPS
+      - lib/web_ui/**
+      - web_sdk/**
+
+  - name: Mac iOS Engine Profile
+    builder: Mac iOS Engine Profile
+    presubmit: false
+    recipe: engine
+    properties:
+      build_ios: "true"
+      ios_profile: "true"
+      jazzy_version: 0.9.5
+    timeout: 90
+    scheduler: luci
+
+  - name: Mac iOS Engine Release
+    builder: Mac iOS Engine Release
+    presubmit: false
+    recipe: engine
+    properties:
+      build_ios: "true"
+      ios_release: "true"
+      jazzy_version: 0.9.5
+    timeout: 90
+    scheduler: luci

.cirrus.yml

@@ -30,8 +30,6 @@ task:
     mv $CIRRUS_WORKING_DIR flutter
     gclient sync
   matrix:
-    # The following test depends on Flutter framework repo. It may fail if the
-    # framework repo is currently broken.
     - name: build_and_test_linux_unopt_debug
       compile_host_script: |
         cd $ENGINE_PATH/src
@@ -50,12 +48,4 @@ 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
-      test_framework_script: |
-        cd $FRAMEWORK_PATH/flutter/packages/flutter
-        ../../bin/flutter test --local-engine=host_debug_unopt --null-assertions --sound-null-safety
-    # TODO(fujino): remove this once ci/licenses.sh is run on LUCI
-    - name: licenses_check
-      build_script: |
-        cd $ENGINE_PATH/src/flutter
-        ./ci/licenses.sh
+        bin/flutter analyze --flutter-repo --local-engine=host_debug_unopt

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,6 @@ writing and running engine tests.
 - [ ] I updated/added relevant documentation (doc comments with `///`).
 - [ ] I signed the [CLA].
 - [ ] All existing and new tests are passing.
-- [ ] The reviewer has submitted any presubmit flakes in this PR using the [engine presubmit flakes form] before re-triggering the failure.
 
 If you need help, consider asking for advice on the #hackers-new channel on [Discord].
 
@@ -29,4 +28,3 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
 [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

@@ -130,3 +130,6 @@ app.*.symbols
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
 !/dev/ci/**/Gemfile.lock
+
+# Prebuilt binaries.
+/prebuilts/

AUTHORS

@@ -18,3 +18,5 @@ shoryukenn <naifu.guan@gmail.com>
 SOTEC GmbH & Co. KG <sotec-contributors@sotec.eu>
 Hidenori Matsubayashi <Hidenori.Matsubayashi@sony.com>
 Sarbagya Dhaubanjar <mail@sarbagyastha.com.np>
+Callum Moffat <callum@moffatman.com>
+Koutaro Mori <koutaro.mo@gmail.com>