Merge branch 'main' into size_swapchain_with_callback

flutter · Feb 1, 2024 · 1664195 · 1664195
2 parents 86e5c2e + f2b9921
commit 1664195
Show file tree

Hide file tree

Showing 139 changed files with 2,323 additions and 1,811 deletions.
diff --git a/DEPS b/DEPS
@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'bf27636582c7151635be402cc3bf5d38d1ed2b15',
+  'skia_revision': '19e5e8f089b24ae56af4345f728c1dd8058005d2',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -62,7 +62,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '488e33cd39deb7aa7c0856c3fde2454d72b123ba',
+  'dart_revision': '82936dcdaf4f8e01fa40962ae5786622c13b8702',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -78,9 +78,9 @@ vars = {
   'dart_protobuf_gn_rev': 'ca669f79945418f6229e4fef89b666b2a88cbb10',
   'dart_protobuf_rev': 'a293fb9c866b1def3d3e7fffc5f6763a2ec59cc9',
   'dart_pub_rev': 'a3689f03168c896dd1cb0db8a60c568b38ee16bf',
-  'dart_tools_rev': '8ffc077f93ecb630c76a833be2cc80b918916428',
+  'dart_tools_rev': 'f6e67f2223fd5f9c6bdb3ace908d22c73ea02bc5',
   'dart_watcher_rev': '66cd694ffb7ee6e09ff0cde6c9f788aa47ee1a23',
-  'dart_webdev_rev': 'f32fdc48f0ae7cb7fa8088233fd69e2ed30af457',
+  'dart_webdev_rev': '2539d54bca7143a2dd1a1ec5d55fa38ca481639c',
   'dart_webkit_inspection_protocol_rev': '667c55e6f65638592768e0325b75420e39b01d2e',
   'dart_yaml_edit_rev': '47eb20e9083954b7b9ec1fb04e7a9f8976a8ed14',
   'dart_zlib_rev': '14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f',
@@ -342,7 +342,7 @@ deps = {
    {'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:226af81369622cce9c0d98adbe31598208a27cc0'}]},
 
   'src/third_party/dart/third_party/pkg/args':
-   Var('dart_git') + '/args.git@46d5033377d277d70bc6ec68504730b9384b1db1',
+   Var('dart_git') + '/args.git@03386ba1cc338086af46f1c742ef944c6a402862',
 
   'src/third_party/dart/third_party/pkg/async':
    Var('dart_git') + '/async.git@e83d054b3ea0ff6cb25e5849c5408cd7c4fc1d3f',
@@ -372,7 +372,7 @@ deps = {
    Var('dart_git') + '/crypto.git@f2efb981b461dcae43d0cf18a3a970142abfee35',
 
   'src/third_party/dart/third_party/pkg/csslib':
-   Var('dart_git') + '/csslib.git@1ad2d1ec461fb1836180e917220a5a48fd641897',
+   Var('dart_git') + '/csslib.git@ec86ee57c89f683352e66c55542bcc1daa425c13',
 
   'src/third_party/dart/third_party/pkg/dart_style':
    Var('dart_git') + '/dart_style.git@633b01cba68f4b42ddc2985c3d521c22149d5ce3',
@@ -390,13 +390,13 @@ deps = {
    Var('dart_git') + '/glob.git@7c9a121e92687b7ac6456ec0796eb1e5c0373d90',
 
   'src/third_party/dart/third_party/pkg/html':
-   Var('dart_git') + '/html.git@06bc148600b1d1a70f2256bdf788c213f1f60f55',
+   Var('dart_git') + '/html.git@910f6d703ed0193318fb095be09e8ddf1bec3e05',
 
   'src/third_party/dart/third_party/pkg/http':
    Var('dart_git') + '/http.git@f0a02f98f7c921e86ecc81c70f38bb6fbccc81b9',
 
   'src/third_party/dart/third_party/pkg/http_multi_server':
-   Var('dart_git') + '/http_multi_server.git@ae484896624cee8b0a8a97a0fb1ea323c4c3d31f',
+   Var('dart_git') + '/http_multi_server.git@491f7c613198d38c489ee0010b9c5377ad29afde',
 
   'src/third_party/dart/third_party/pkg/http_parser':
    Var('dart_git') + '/http_parser.git@224c1a9d24b46c7a9da1f09147e0e1fbda78089d',
@@ -411,7 +411,7 @@ deps = {
    Var('dart_git') + '/leak_tracker.git@4a5b077739886f61bd6dc11c78865ef487c917c2',
 
   'src/third_party/dart/third_party/pkg/logging':
-   Var('dart_git') + '/logging.git@4d35a4e02b9237bd794378413e7ce3deb52ffcaf',
+   Var('dart_git') + '/logging.git@e04942dadc6ed9ed177ab0c6b8d0e80a789cd176',
 
   'src/third_party/dart/third_party/pkg/markdown':
    Var('dart_git') + '/markdown.git@a8288ca3a3023228f1a8a832b78d00e11f0c4b30',
@@ -420,13 +420,13 @@ deps = {
    Var('dart_git') + '/matcher.git@d9cf4f69e3f557718ab5be042dd5503afcacac51',
 
   'src/third_party/dart/third_party/pkg/mime':
-   Var('dart_git') + '/mime.git@ca9f059d2334bb2657683e0a7f5949817cb4b0e6',
+   Var('dart_git') + '/mime.git@99fbdcc745e2f2cfb85be4a4c6c7b520cd25c2dd',
 
   'src/third_party/dart/third_party/pkg/mockito':
-   Var('dart_git') + '/mockito.git@e15e00086ed20f3175b2e677fd11611be4fa8e8e',
+   Var('dart_git') + '/mockito.git@0422551a774cbf72eea87ba80e71f7b5d81199f3',
 
   'src/third_party/dart/third_party/pkg/native':
-   Var('dart_git') + '/native.git@40382efb9c7a0774d2764238fc1802e562e9cbaf',
+   Var('dart_git') + '/native.git@0eafd544d6ebce07b42007560ae9e0858c885d89',
 
   'src/third_party/dart/third_party/pkg/package_config':
    Var('dart_git') + '/package_config.git@33dd24659147bd7ed2fa87aeacc52d199be766b4',
@@ -477,7 +477,7 @@ deps = {
    Var('dart_git') + '/term_glyph.git@4c5a49664ee78b62c35de528cec5a9469bb84936',
 
   'src/third_party/dart/third_party/pkg/test':
-   Var('dart_git') + '/test.git@846d73ee40a9cbd86348bc3cfc97f9c765872f2d',
+   Var('dart_git') + '/test.git@6700049d5de97906d033f4271f67f7599090bf4e',
 
   'src/third_party/dart/third_party/pkg/test_reflective_loader':
    Var('dart_git') + '/test_reflective_loader.git@6edf5358b53bfda487840bad1a03d089326fa08c',
@@ -982,7 +982,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'Z-xFM2ILZJw22eU8qOl52sPcOgS3CQtJ1LkWDRe_dtwC'
+        'version': 'nymRxHV9Shod7cyLeph-eLvug_6Wz_qFAIM1LeUTwOAC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',

diff --git a/ci/builders/linux_fuchsia.json b/ci/builders/linux_fuchsia.json
@@ -115,10 +115,12 @@
         {
             "drone_dimensions": [
                 "device_type=none",
+                "kvm=1",
                 "os=Linux"
             ],
             "gclient_variables": {
-                "download_android_deps": false
+                "download_android_deps": false,
+                "run_fuchsia_emu": true
             },
             "gn": [
                 "--fuchsia",
@@ -131,9 +133,22 @@
             "ninja": {
                 "config": "fuchsia_release_x64",
                 "targets": [
-                    "flutter/shell/platform/fuchsia:fuchsia"
+                    "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
+                    "fuchsia_tests"
                 ]
-            }
+            },
+            "tests": [
+                {
+                    "name": "x64 emulator based release tests",
+                    "language": "python3",
+                    "script": "flutter/tools/fuchsia/with_envs.py",
+                    "parameters": [
+                        "testing/fuchsia/run_tests.py",
+                        "fuchsia_release_x64"
+                    ]
+                }
+            ]
         },
         {
             "drone_dimensions": [
@@ -158,6 +173,7 @@
                 "config": "fuchsia_debug_x64",
                 "targets": [
                     "flutter/shell/platform/fuchsia:fuchsia",
+                    "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests",
                     "fuchsia_tests"
                 ]
             },
@@ -176,7 +192,7 @@
                     ]
                 },
                 {
-                    "name": "x64 emulator based tests",
+                    "name": "x64 emulator based debug tests",
                     "language": "python3",
                     "script": "flutter/tools/fuchsia/with_envs.py",
                     "parameters": [

diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
@@ -159,6 +159,7 @@
                 "--prebuilt-dart-sdk",
                 "--build-embedder-examples",
                 "--enable-impeller-vulkan",
+                "--enable-impeller-opengles",
                 "--use-glfw-swiftshader"
             ],
             "name": "host_release",

diff --git a/ci/licenses_golden/licenses_dart b/ci/licenses_golden/licenses_dart
@@ -1,4 +1,4 @@
-Signature: 1fcd064754227797855c64a9b0bfca79
+Signature: 2c005d749b65ecc8add010e6a96f988f
 
 ====================================================================================================
 LIBRARY: dart
@@ -4705,7 +4705,7 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
 
-You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/10bbb376de7e4ec0047d6a949fe69e5dddfb7b97
+You may obtain a copy of this library's Source Code Form from: https://dart.googlesource.com/sdk/+/fbf1d8ebceb475179e0445edde13d9400b62aca0
 /third_party/fallback_root_certificates/
 
 ====================================================================================================

diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -5478,6 +5478,8 @@ ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.cc + ../..
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.h + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.cc + ../../../flutter/LICENSE
@@ -5857,7 +5859,6 @@ ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc + ../../../f
 ORIGIN: ../../../flutter/lib/ui/text/asset_manager_font_provider.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/font_collection.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/font_collection.h + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/ui/text/line_metrics.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph.cc + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph.h + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/ui/text/paragraph_builder.cc + ../../../flutter/LICENSE
@@ -5964,7 +5965,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart + ../../../
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/configuration.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/display.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/dom.dart + ../../../flutter/LICENSE
-ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/embedder.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/font_fallback_data.dart + ../../../flutter/LICENSE
@@ -5998,6 +5998,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart + ../
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/renderer.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/resource_manager.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/html/shader_mask.dart + ../../../flutter/LICENSE
@@ -6142,6 +6143,7 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strat
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart + ../../../flutter/LICENSE
+ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart + ../../../flutter/LICENSE
 ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/window.dart + ../../../flutter/LICENSE
@@ -8334,6 +8336,8 @@ FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/pipeline_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/queue_vk.h
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.cc
+FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_builder_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.cc
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/render_pass_vk.h
 FILE: ../../../flutter/impeller/renderer/backend/vulkan/resource_manager_vk.cc
@@ -8717,7 +8721,6 @@ FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.cc
 FILE: ../../../flutter/lib/ui/text/asset_manager_font_provider.h
 FILE: ../../../flutter/lib/ui/text/font_collection.cc
 FILE: ../../../flutter/lib/ui/text/font_collection.h
-FILE: ../../../flutter/lib/ui/text/line_metrics.h
 FILE: ../../../flutter/lib/ui/text/paragraph.cc
 FILE: ../../../flutter/lib/ui/text/paragraph.h
 FILE: ../../../flutter/lib/ui/text/paragraph_builder.cc
@@ -8825,7 +8828,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/color_filter.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/configuration.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/display.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/dom.dart
-FILE: ../../../flutter/lib/web_ui/lib/src/engine/embedder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/engine_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_change_util.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/font_fallback_data.dart
@@ -8859,6 +8861,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/platform_view.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/recording_canvas.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/render_vertices.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/renderer.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/resource_manager.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/scene_builder.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/html/shader_mask.dart
@@ -9003,6 +9006,7 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strateg
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/flutter_view_manager.dart
+FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/global_html_attributes.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/style_manager.dart
 FILE: ../../../flutter/lib/web_ui/lib/src/engine/window.dart

diff --git a/ci/licenses_golden/licenses_fuchsia b/ci/licenses_golden/licenses_fuchsia
@@ -1,4 +1,4 @@
-Signature: 1f3843358b659d834d9358a85911f7ae
+Signature: 6a98456bbe14977c6aed168ddf5938c2
 
 ====================================================================================================
 LIBRARY: fuchsia_sdk

diff --git a/ci/licenses_golden/licenses_skia b/ci/licenses_golden/licenses_skia
@@ -1,4 +1,4 @@
-Signature: 8952a309a0f9d4d87b999cb868f603f8
+Signature: bd507bde68391717cdda555e7b282c11
 
 ====================================================================================================
 LIBRARY: etc1
@@ -9502,10 +9502,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ====================================================================================================
 LIBRARY: skia
+ORIGIN: ../../../flutter/third_party/skia/gm/imagedither.cpp + ../../../flutter/third_party/skia/LICENSE
 ORIGIN: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckSymbolTableCorrectness.cpp + ../../../flutter/third_party/skia/LICENSE
 ORIGIN: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.cpp + ../../../flutter/third_party/skia/LICENSE
 ORIGIN: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs.cpp + ../../../flutter/third_party/skia/LICENSE
 TYPE: LicenseType.bsd
+FILE: ../../../flutter/third_party/skia/gm/imagedither.cpp
 FILE: ../../../flutter/third_party/skia/src/sksl/analysis/SkSLCheckSymbolTableCorrectness.cpp
 FILE: ../../../flutter/third_party/skia/src/sksl/ir/SkSLSymbol.cpp
 FILE: ../../../flutter/third_party/skia/src/sksl/transform/SkSLFindAndDeclareBuiltinStructs.cpp

diff --git a/common/settings.h b/common/settings.h
@@ -232,6 +232,9 @@ struct Settings {
   // Some devices claim to support the required APIs but crash on their usage.
   bool enable_opengl_gpu_tracing = false;
 
+  // Enable GPU tracing in Vulkan backends.
+  bool enable_vulkan_gpu_tracing = false;
+
   // Data set by platform-specific embedders for use in font initialization.
   uint32_t font_initialization_data = 0;
 

diff --git a/fml/task_source.cc b/fml/task_source.cc
@@ -28,7 +28,7 @@ void TaskSource::RegisterTask(const DelayedTask& task) {
     case TaskSourceGrade::kUnspecified:
       primary_task_queue_.push(task);
       break;
-    case TaskSourceGrade::kDartMicroTasks:
+    case TaskSourceGrade::kDartEventLoop:
       secondary_task_queue_.push(task);
       break;
   }
@@ -42,7 +42,7 @@ void TaskSource::PopTask(TaskSourceGrade grade) {
     case TaskSourceGrade::kUnspecified:
       primary_task_queue_.pop();
       break;
-    case TaskSourceGrade::kDartMicroTasks:
+    case TaskSourceGrade::kDartEventLoop:
       secondary_task_queue_.pop();
       break;
   }

diff --git a/fml/task_source_grade.h b/fml/task_source_grade.h
@@ -17,8 +17,8 @@ enum class TaskSourceGrade {
   /// interaction.
   kUserInteraction,
   /// This `TaskSourceGrade` indicates that a task corresponds to servicing a
-  /// dart micro task. These aren't critical to user interaction.
-  kDartMicroTasks,
+  /// dart event loop task. These aren't critical to user interaction.
+  kDartEventLoop,
   /// The absence of a specialized `TaskSourceGrade`.
   kUnspecified,
 };

diff --git a/fml/task_source_unittests.cc b/fml/task_source_unittests.cc
@@ -29,7 +29,7 @@ TEST(TaskSourceTests, MultipleTaskGrades) {
   task_source.RegisterTask(
       {2, [] {}, ChronoTicksSinceEpoch(), TaskSourceGrade::kUserInteraction});
   task_source.RegisterTask(
-      {3, [] {}, ChronoTicksSinceEpoch(), TaskSourceGrade::kDartMicroTasks});
+      {3, [] {}, ChronoTicksSinceEpoch(), TaskSourceGrade::kDartEventLoop});
   ASSERT_EQ(task_source.GetNumPendingTasks(), 3u);
 }
 
@@ -55,7 +55,7 @@ TEST(TaskSourceTests, SimpleOrderingMultiTaskHeaps) {
   auto time_stamp = ChronoTicksSinceEpoch();
   int value = 0;
   task_source.RegisterTask(
-      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartMicroTasks});
+      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartEventLoop});
   task_source.RegisterTask({2, [&] { value = 7; },
                             time_stamp + fml::TimeDelta::FromMilliseconds(1),
                             TaskSourceGrade::kUserInteraction});
@@ -75,7 +75,7 @@ TEST(TaskSourceTests, OrderingMultiTaskHeapsSecondaryPaused) {
   auto time_stamp = ChronoTicksSinceEpoch();
   int value = 0;
   task_source.RegisterTask(
-      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartMicroTasks});
+      {1, [&] { value = 1; }, time_stamp, TaskSourceGrade::kDartEventLoop});
   task_source.RegisterTask({2, [&] { value = 7; },
                             time_stamp + fml::TimeDelta::FromMilliseconds(1),
                             TaskSourceGrade::kUserInteraction});