diff --git a/DEPS b/DEPS index 75bcccf703..f6c4026808 100644 --- a/DEPS +++ b/DEPS @@ -57,7 +57,7 @@ deps = { Var('fuchsia_git') + '/ftl' + '@' + 'f1357b6eaa9a23cffec1645dfeba610b5f926b1d', 'src/lib/tonic': - Var('fuchsia_git') + '/tonic' + '@' + '82075233dc0cd23b1c8af5f694eb86dd9bd10f35', + Var('fuchsia_git') + '/tonic' + '@' + '02431161f012a18c32f885e04b1eda51e6c11f8e', 'src/lib/zip': Var('fuchsia_git') + '/zip' + '@' + '92dc87ca645fe8e9f5151ef6dac86d8311a7222f', diff --git a/engine/src/flutter/lib/ui/dart_runtime_hooks.cc b/engine/src/flutter/lib/ui/dart_runtime_hooks.cc index aa028ddb3e..57c9f9b659 100644 --- a/engine/src/flutter/lib/ui/dart_runtime_hooks.cc +++ b/engine/src/flutter/lib/ui/dart_runtime_hooks.cc @@ -172,7 +172,7 @@ void ScheduleMicrotask(Dart_NativeArguments args) { Dart_Handle closure = Dart_GetNativeArgument(args, 0); if (LogIfError(closure) || !Dart_IsClosure(closure)) return; - tonic::DartMicrotaskQueue::ScheduleMicrotask(closure); + tonic::DartMicrotaskQueue::GetForCurrentThread()->ScheduleMicrotask(closure); } } // namespace blink diff --git a/engine/src/flutter/lib/ui/window/window.cc b/engine/src/flutter/lib/ui/window/window.cc index c5ee7e8f51..16418b7060 100644 --- a/engine/src/flutter/lib/ui/window/window.cc +++ b/engine/src/flutter/lib/ui/window/window.cc @@ -223,7 +223,7 @@ void Window::BeginFrame(ftl::TimePoint frameTime) { Dart_NewInteger(microseconds), }); - tonic::DartMicrotaskQueue::RunMicrotasks(); + tonic::DartMicrotaskQueue::GetForCurrentThread()->RunMicrotasks(); DartInvokeField(library_.value(), "_drawFrame", {}); } diff --git a/engine/src/flutter/shell/platform/linux/main_linux.cc b/engine/src/flutter/shell/platform/linux/main_linux.cc index 26ee9666bf..25750fa6fe 100644 --- a/engine/src/flutter/shell/platform/linux/main_linux.cc +++ b/engine/src/flutter/shell/platform/linux/main_linux.cc @@ -103,7 +103,7 @@ void RunNonInteractive(ftl::CommandLine initial_command_line, if (error == tonic::kNoError) error = task_observer.last_error(); if (error == tonic::kNoError) - error = tonic::DartMicrotaskQueue::GetLastError(); + error = tonic::DartMicrotaskQueue::GetForCurrentThread()->GetLastError(); // The script has completed and the engine may not be in a clean state, // so just stop the process.