Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions shell/platform/fuchsia/flutter/engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,20 @@ void Engine::Initialize(

Engine::~Engine() {
shell_.reset();

// Destroy rendering objects on the raster thread.
fml::AutoResetWaitableEvent view_embedder_latch;
thread_host_.raster_thread->GetTaskRunner()->PostTask(
fml::MakeCopyable([this, &view_embedder_latch]() mutable {
flatland_view_embedder_.reset();
external_view_embedder_.reset();
surface_producer_.reset();
flatland_connection_.reset();
session_connection_.reset();

view_embedder_latch.Signal();
}));
view_embedder_latch.Wait();
}

std::optional<uint32_t> Engine::GetEngineReturnCode() const {
Expand Down
14 changes: 6 additions & 8 deletions shell/platform/fuchsia/flutter/engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,14 @@ class Engine final {
const std::string thread_label_;
flutter::ThreadHost thread_host_;

std::optional<VulkanSurfaceProducer> surface_producer_;

// Gfx specific classes.
fuchsia::ui::views::ViewToken view_token_;
std::shared_ptr<GfxSessionConnection> session_connection_;
std::shared_ptr<FuchsiaExternalViewEmbedder> external_view_embedder_;

// Flatland specific classes.
fuchsia::ui::views::ViewCreationToken view_creation_token_;
std::shared_ptr<FlatlandConnection> flatland_connection_;
std::shared_ptr<GfxSessionConnection>
session_connection_; // Must come before surface_producer_
std::shared_ptr<FlatlandConnection>
flatland_connection_; // Must come before surface_producer_
std::optional<VulkanSurfaceProducer> surface_producer_;
std::shared_ptr<FuchsiaExternalViewEmbedder> external_view_embedder_;
std::shared_ptr<FlatlandExternalViewEmbedder> flatland_view_embedder_;

scenic::ViewRefPair view_ref_pair_;
Expand Down