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

[fuchsia][scenic] Call GetViewRef once per view in flatland platform view. #36304

Merged
merged 1 commit into from
Sep 21, 2022
Merged

[fuchsia][scenic] Call GetViewRef once per view in flatland platform view. #36304

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
7 changes: 0 additions & 7 deletions shell/platform/fuchsia/flutter/flatland_platform_view.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,6 @@ void FlatlandPlatformView::OnChildViewViewRef(
fidl::Clone(view_ref, &view_ref_clone);
pointer_injector_delegate_->OnCreateView(view_id, std::move(view_ref_clone));
OnChildViewConnected(content_id);

// TODO(http://fxbug.dev/109948): Remove the following GetViewRef call.
child_view_info_.at(content_id)
.child_view_watcher->GetViewRef(
[this, content_id, view_id](fuchsia::ui::views::ViewRef view_ref) {
this->OnChildViewViewRef(content_id, view_id, std::move(view_ref));
});
}

void FlatlandPlatformView::OnCreateView(ViewCallback on_view_created,
Expand Down
4 changes: 1 addition & 3 deletions shell/platform/fuchsia/flutter/tests/flatland_platform_view_unittest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,7 @@ class MockChildViewWatcher
// |fuchsia::ui::composition::ChildViewWatcher|
void GetViewRef(GetViewRefCallback callback) override {
// GetViewRef only returns once as per flatland.fidl comments
if (control_ref_.reference) {
return;
}
ASSERT_FALSE(control_ref_.reference);
auto pair = scenic::ViewRefPair::New();
control_ref_ = std::move(pair.control_ref);
callback(std::move(pair.view_ref));
Expand Down