@@ -235,22 +235,24 @@ std::unique_ptr<Shell> Shell::Create(
235235 std::make_shared<ResourceCacheLimitCalculator>(
236236 settings.resource_cache_max_bytes_threshold );
237237
238- return CreateWithSnapshot (platform_data, //
239- task_runners, //
240- /* parent_thread_merger=*/ nullptr , //
241- /* parent_io_manager=*/ nullptr , //
242- resource_cache_limit_calculator, //
243- settings, //
244- std::move (vm), //
245- std::move (isolate_snapshot), //
246- on_create_platform_view, //
247- on_create_rasterizer, //
238+ return CreateWithSnapshot (platform_data, //
239+ task_runners, //
240+ /* parent_thread_merger=*/ nullptr , //
241+ /* parent_rasterizer=*/ std::nullopt , //
242+ /* parent_io_manager=*/ nullptr , //
243+ resource_cache_limit_calculator, //
244+ settings, //
245+ std::move (vm), //
246+ std::move (isolate_snapshot), //
247+ on_create_platform_view, //
248+ on_create_rasterizer, //
248249 CreateEngine, is_gpu_disabled);
249250}
250251
251252std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread (
252253 DartVMRef vm,
253254 fml::RefPtr<fml::RasterThreadMerger> parent_merger,
255+ std::optional<fml::TaskRunnerAffineWeakPtr<Rasterizer>> parent_rasterizer,
254256 std::shared_ptr<ShellIOManager> parent_io_manager,
255257 const std::shared_ptr<ResourceCacheLimitCalculator>&
256258 resource_cache_limit_calculator,
@@ -269,7 +271,8 @@ std::unique_ptr<Shell> Shell::CreateShellOnPlatformThread(
269271
270272 auto shell = std::unique_ptr<Shell>(
271273 new Shell (std::move (vm), task_runners, std::move (parent_merger),
272- resource_cache_limit_calculator, settings, is_gpu_disabled));
274+ std::move (parent_rasterizer), resource_cache_limit_calculator,
275+ settings, is_gpu_disabled));
273276
274277 // Create the platform view on the platform thread (this thread).
275278 auto platform_view = on_create_platform_view (*shell.get ());
@@ -442,6 +445,7 @@ std::unique_ptr<Shell> Shell::CreateWithSnapshot(
442445 const PlatformData& platform_data,
443446 const TaskRunners& task_runners,
444447 const fml::RefPtr<fml::RasterThreadMerger>& parent_thread_merger,
448+ std::optional<fml::TaskRunnerAffineWeakPtr<Rasterizer>> parent_rasterizer,
445449 const std::shared_ptr<ShellIOManager>& parent_io_manager,
446450 const std::shared_ptr<ResourceCacheLimitCalculator>&
447451 resource_cache_limit_calculator,
@@ -471,6 +475,7 @@ std::unique_ptr<Shell> Shell::CreateWithSnapshot(
471475 fml::MakeCopyable ([&latch, //
472476 &shell, //
473477 parent_thread_merger, //
478+ parent_rasterizer = std::move (parent_rasterizer), //
474479 parent_io_manager, //
475480 resource_cache_limit_calculator, //
476481 task_runners = task_runners, //
@@ -484,6 +489,7 @@ std::unique_ptr<Shell> Shell::CreateWithSnapshot(
484489 is_gpu_disabled]() mutable {
485490 shell = CreateShellOnPlatformThread (std::move (vm), //
486491 parent_thread_merger, //
492+ std::move (parent_rasterizer), //
487493 parent_io_manager, //
488494 resource_cache_limit_calculator, //
489495 task_runners, //
@@ -500,15 +506,18 @@ std::unique_ptr<Shell> Shell::CreateWithSnapshot(
500506 return shell;
501507}
502508
503- Shell::Shell (DartVMRef vm,
504- const TaskRunners& task_runners,
505- fml::RefPtr<fml::RasterThreadMerger> parent_merger,
506- const std::shared_ptr<ResourceCacheLimitCalculator>&
507- resource_cache_limit_calculator,
508- const Settings& settings,
509- bool is_gpu_disabled)
509+ Shell::Shell (
510+ DartVMRef vm,
511+ const TaskRunners& task_runners,
512+ fml::RefPtr<fml::RasterThreadMerger> parent_merger,
513+ std::optional<fml::TaskRunnerAffineWeakPtr<Rasterizer>> parent_rasterizer,
514+ const std::shared_ptr<ResourceCacheLimitCalculator>&
515+ resource_cache_limit_calculator,
516+ const Settings& settings,
517+ bool is_gpu_disabled)
510518 : task_runners_(task_runners),
511519 parent_raster_thread_merger_ (std::move(parent_merger)),
520+ parent_rasterizer_(std::move(parent_rasterizer)),
512521 resource_cache_limit_calculator_(resource_cache_limit_calculator),
513522 settings_(settings),
514523 vm_(std::move(vm)),
@@ -709,9 +718,9 @@ std::unique_ptr<Shell> Shell::Spawn(
709718 .SetIfTrue ([&is_gpu_disabled] { is_gpu_disabled = true ; }));
710719 std::unique_ptr<Shell> result = CreateWithSnapshot (
711720 PlatformData{}, task_runners_, rasterizer_->GetRasterThreadMerger (),
712- io_manager_, resource_cache_limit_calculator_, GetSettings (), vm_ ,
713- vm_->GetVMData ()->GetIsolateSnapshot (), on_create_platform_view ,
714- on_create_rasterizer,
721+ weak_rasterizer_, io_manager_, resource_cache_limit_calculator_ ,
722+ GetSettings (), vm_, vm_ ->GetVMData ()->GetIsolateSnapshot (),
723+ on_create_platform_view, on_create_rasterizer,
715724 [engine = this ->engine_ .get (), initial_route](
716725 Engine::Delegate& delegate, DartVM& vm,
717726 const fml::RefPtr<const DartSnapshot>& isolate_snapshot,
@@ -938,7 +947,21 @@ const TaskRunners& Shell::GetTaskRunners() const {
938947
939948const fml::RefPtr<fml::RasterThreadMerger> Shell::GetParentRasterThreadMerger ()
940949 const {
941- return parent_raster_thread_merger_;
950+ if (parent_raster_thread_merger_) {
951+ return parent_raster_thread_merger_;
952+ }
953+ // If the parent's `Rasterizer::Setup()` was still deferred on the raster
954+ // thread when `Shell::Spawn()` ran, resolve the immediate parent's merger
955+ // lazily on the raster thread. (Note: for >=3-deep spawn chains where an
956+ // intermediate child also has no merger yet at grandchild setup time, only
957+ // the immediate parent's rasterizer is consulted, matching prior behavior
958+ // when an intermediate shell never attached a view.)
959+ if (parent_rasterizer_.has_value () &&
960+ task_runners_.GetRasterTaskRunner ()->RunsTasksOnCurrentThread () &&
961+ *parent_rasterizer_) {
962+ return (*parent_rasterizer_)->GetRasterThreadMerger ();
963+ }
964+ return nullptr ;
942965}
943966
944967fml::TaskRunnerAffineWeakPtr<Rasterizer> Shell::GetRasterizer () const {
@@ -1061,6 +1084,62 @@ void Shell::OnPlatformViewCreated(std::unique_ptr<Surface> surface) {
10611084 // NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDeleteLeaks)
10621085}
10631086
1087+ // |PlatformView::Delegate|
1088+ void Shell::OnPlatformViewCreatedDeferred (
1089+ PlatformView::SurfaceFactory surface_factory) {
1090+ TRACE_EVENT0 (" flutter" , " Shell::OnPlatformViewCreatedDeferred" );
1091+ FML_DCHECK (is_set_up_);
1092+ FML_DCHECK (task_runners_.GetPlatformTaskRunner ()->RunsTasksOnCurrentThread ());
1093+
1094+ // `platform_view` and `waiting_for_first_frame_` outlive both the raster task
1095+ // and the IO task it posts because `Shell::~Shell()` drains UI -> Raster ->
1096+ // IO synchronously via latches before resetting `platform_view_`. Posting the
1097+ // IO resource-context setup from inside the raster task orders it after
1098+ // `SetupImpellerContext()`, and scheduling the UI frame from that IO task
1099+ // ensures any resulting draw queues behind `Rasterizer::Setup()`.
1100+ auto * platform_view = platform_view_.get ();
1101+ FML_DCHECK (platform_view);
1102+ fml::TaskRunner::RunNowOrPostTask (
1103+ task_runners_.GetRasterTaskRunner (),
1104+ fml::MakeCopyable ([&waiting_for_first_frame = waiting_for_first_frame_,
1105+ rasterizer = rasterizer_->GetWeakPtr (),
1106+ io_task_runner = task_runners_.GetIOTaskRunner (),
1107+ io_manager = io_manager_->GetWeakPtr (),
1108+ ui_task_runner = task_runners_.GetUITaskRunner (),
1109+ engine = engine_->GetWeakPtr (), platform_view,
1110+ surface_factory =
1111+ std::move (surface_factory)]() mutable {
1112+ TRACE_EVENT0 (" flutter" , " Shell::OnPlatformViewCreatedDeferred::Raster" );
1113+ if (!rasterizer) {
1114+ return ;
1115+ }
1116+ std::unique_ptr<Surface> surface = surface_factory ();
1117+ if (!surface || !surface->IsValid ()) {
1118+ return ;
1119+ }
1120+ fml::TaskRunner::RunNowOrPostTask (
1121+ io_task_runner,
1122+ [io_manager, platform_view, ui_task_runner, engine]() {
1123+ if (io_manager && !io_manager->GetResourceContext ()) {
1124+ sk_sp<GrDirectContext> resource_context =
1125+ platform_view->CreateResourceContext ();
1126+ io_manager->NotifyResourceContextAvailable (resource_context);
1127+ }
1128+ fml::TaskRunner::RunNowOrPostTask (ui_task_runner, [engine]() {
1129+ if (engine) {
1130+ engine->ScheduleFrame ();
1131+ }
1132+ });
1133+ });
1134+ // `DisableThreadMergerIfNeeded()` is not called on the deferred path;
1135+ // if `OnPlatformViewDestroyed()` set `thread_merger_disabled_` while
1136+ // `surface_factory()` was in flight, `Rasterizer::Setup()` creates the
1137+ // merger already disabled.
1138+ rasterizer->Setup (std::move (surface));
1139+ waiting_for_first_frame.store (true );
1140+ }));
1141+ }
1142+
10641143// |PlatformView::Delegate|
10651144void Shell::OnPlatformViewDestroyed () {
10661145 TRACE_EVENT0 (" flutter" , " Shell::OnPlatformViewDestroyed" );
0 commit comments