firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Impeller] Fix source offset in PathBuilder::AddPath (#162052)

Browse Source 
An error in bookkeeping in `PathBuilder::AddPath` caused crashes in
recent unit tests (see https://github.com/flutter/flutter/pull/162046)
This commit is contained in:
Jim Graham 2025-01-23 21:18:25 -08:00 committed by GitHub
parent 96e74bbb41
commit 83bac343ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/impeller/geometry/path_builder.cc
View File

@ -450,13 +450,13 @@ PathBuilder& PathBuilder::AddLine(const Point& p1, const Point& p2) {
PathBuilder& PathBuilder::AddPath(const Path& path) { PathBuilder& PathBuilder::AddPath(const Path& path) {
auto& points = prototype_.points; auto& points = prototype_.points;
auto& components = prototype_.components; auto& components = prototype_.components;
size_t source_offset = points.size();
points.insert(points.end(), path.data_->points.begin(), points.insert(points.end(), path.data_->points.begin(),
path.data_->points.end()); path.data_->points.end());
components.insert(components.end(), path.data_->components.begin(), components.insert(components.end(), path.data_->components.begin(),
path.data_->components.end()); path.data_->components.end());
size_t source_offset = points.size();
for (auto component : path.data_->components) { for (auto component : path.data_->components) {
if (component == Path::ComponentType::kContour) { if (component == Path::ComponentType::kContour) {
current_contour_location_ = source_offset; current_contour_location_ = source_offset;

26
engine/src/flutter/impeller/geometry/path_unittests.cc
View File

@ -817,6 +817,32 @@ TEST(PathTest, StripTessellationMultiContour) {
EXPECT_EQ(point_storage[0], Point(10, 0)); EXPECT_EQ(point_storage[0], Point(10, 0));
} }
TEST(PathTest, PathBuilderAddPathBasher) {
PathBuilder test_path_builder;
test_path_builder.AddOval(Rect::MakeLTRB(10, 10, 50, 50));
Path test_path = test_path_builder.TakePath();
for (int i = 0; i < 2000; i++) {
PathBuilder path_builder;
for (int j = 0; j < 10; j++) {
path_builder.AddCircle(Point(50, 50), 25);
path_builder.AddOval(Rect::MakeLTRB(100, 100, 200, 200));
path_builder.AddPath(test_path);
path_builder.AddRect(Rect::MakeLTRB(50, 50, 75, 57));
path_builder.AddLine(Point(80, 70), Point(110, 95));
path_builder.AddArc(Rect::MakeLTRB(50, 50, 100, 100), Degrees(20),
Degrees(100));
path_builder.AddRoundRect(RoundRect::MakeRectXY(
Rect::MakeLTRB(70, 70, 130, 130), Size(10, 10)));
}
Path test_path = path_builder.TakePath();
auto bounds = test_path.GetBoundingBox();
EXPECT_TRUE(bounds.has_value());
if (bounds.has_value()) {
EXPECT_EQ(bounds.value(), Rect::MakeLTRB(10, 10, 200, 200));
}
}
}
TEST(PathTest, PathBuilderDoesNotMutateCopiedPaths) { TEST(PathTest, PathBuilderDoesNotMutateCopiedPaths) {
auto test_isolation = auto test_isolation =
[](const std::function<void(PathBuilder & builder)>& mutator, [](const std::function<void(PathBuilder & builder)>& mutator,