Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

fuchsia: Fix multi-views fallout #25984

Merged
merged 1 commit into from
May 7, 2021
Merged

fuchsia: Fix multi-views fallout #25984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion flow/view_holder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void ViewHolder::Destroy(zx_koid_t id, ViewIdCallback on_view_destroyed) {
auto binding = bindings->find(id);
FML_DCHECK(binding != bindings->end());

if (binding->second->view_holder_) {
if (binding->second->view_holder_ && on_view_destroyed) {
on_view_destroyed(binding->second->view_holder_->id());
}
bindings->erase(id);
Expand Down
5 changes: 3 additions & 2 deletions shell/platform/fuchsia/flutter/platform_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,14 @@ bool PlatformView::OnChildViewStateChanged(scenic::ResourceId view_holder_id,
return false;
}

const std::string is_rendering_str = is_rendering ? "true" : "false";
std::ostringstream out;
out << "{"
<< "\"method\":\"View.viewStateChanged\","
<< "\"args\":{"
<< " \"viewId\":" << view_id_mapping->second << "," // ViewHolderToken
<< " \"is_rendering\":" << is_rendering << "," // IsViewRendering
<< " \"state\":" << is_rendering // IsViewRendering
<< " \"is_rendering\":" << is_rendering_str << "," // IsViewRendering
<< " \"state\":" << is_rendering_str // IsViewRendering
<< " }"
<< "}";
auto call = out.str();
Expand Down
6 changes: 3 additions & 3 deletions shell/platform/fuchsia/flutter/platform_view_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,9 +877,9 @@ TEST_F(PlatformViewTests, ViewEventsTest) {
<< "{"
<< "\"method\":\"View.viewStateChanged\","
<< "\"args\":{"
<< " \"viewId\":" << kViewId << "," // ViewHolderToken
<< " \"is_rendering\":" << true << "," // IsViewRendering
<< " \"state\":" << true // IsViewRendering
<< " \"viewId\":" << kViewId << "," // ViewHolderToken
<< " \"is_rendering\":true," // IsViewRendering
<< " \"state\":true" // IsViewRendering
<< " }"
<< "}";
EXPECT_EQ(view_state_changed_expected_out.str(),
Expand Down