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

[iOS platform view] fix active_composition_order_ never cleared #18153

Merged
merged 4 commits into from
May 6, 2020
Merged

[iOS platform view] fix active_composition_order_ never cleared #18153

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a9d7e1
Fix active_composition_order_ never cleared
May 5, 2020
2b54304
cleanup
May 5, 2020
d735964
comment
May 5, 2020
8cf578d
Trigger ci
May 5, 2020
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: 2 additions & 0 deletions shell/platform/darwin/ios/framework/Source/FlutterPlatformViews.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,8 @@
void FlutterPlatformViewsController::BringLayersIntoView(LayersMap layer_map) {
UIView* flutter_view = flutter_view_.get();
auto zIndex = 0;
// Clear the `active_composition_order_`, which will be populated down below.
active_composition_order_.clear();
Copy link

@blasten blasten May 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you add a comment? something like: "Clear the active composition order since the new composition order is determined down below".

Copy link
Contributor Author

@cyanglaz cyanglaz May 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

for (size_t i = 0; i < composition_order_.size(); i++) {
int64_t platform_view_id = composition_order_[i];
std::vector<std::shared_ptr<FlutterPlatformViewLayer>> layers = layer_map[platform_view_id];
Expand Down