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

[iOS] leak a single overlay layer. #54189

Merged
merged 3 commits into from
Jul 29, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,13 @@ static bool ClipRRectContainsPlatformViewBoundingRect(const SkRRect& clip_rrect,
for (size_t i = available_layer_index_; i < layers_.size(); i++) {
results.push_back(layers_[i]);
}
layers_.erase(layers_.begin() + available_layer_index_, layers_.end());
// Leave at least one overlay layer, to work around cases where scrolling
// platform views under an app bar continually adds and removes an
// overlay layer. This logic could be removed if https://github.com/flutter/flutter/issues/150646
// is fixed.
static constexpr size_t kLeakLayerCount = 1;
size_t erase_offset = std::max(available_layer_index_, kLeakLayerCount);
layers_.erase(layers_.begin() + erase_offset, layers_.end());
return results;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3335,10 +3335,10 @@ - (void)testLayerPool {
pool.RecycleLayers();
XCTAssertEqual(pool.size(), 2u);

// Free the unused layers.
// Free the unused layers. One should remain.
auto unused_layers = pool.RemoveUnusedLayers();
XCTAssertEqual(unused_layers.size(), 2u);
XCTAssertEqual(pool.size(), 0u);
XCTAssertEqual(pool.size(), 1u);
}

@end