-
Notifications
You must be signed in to change notification settings - Fork 29.7k
Fix RoundedSuperellipse crashes for tiny corners #177070
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request addresses a crash in RoundedSuperellipse when drawn with very small corner radii. The fix introduces a minimum radius threshold, kMinRadius, below which corners are treated as sharp, correctly avoiding floating-point issues that could lead to NaNs. Additionally, the change includes a robustness improvement by clamping corner radii to the available geometry space, which prevents invalid shapes. A regression test has been added to verify the fix for tiny radii. The changes are logical and well-tested. I have one suggestion to make the new test more robust.
| std::vector<Point> expected_head = {Point(300.0, 200.0), Point(300.0, 300.0), | ||
| Point(200.0, 200.0), Point(200.0, 300.0)}; | ||
|
|
||
| for (size_t i = 0; i < expected_head.size(); i++) { | ||
| const Point& point = written_data[i]; | ||
| EXPECT_NEAR(point.x, expected_head[i].x, 0.1); | ||
| EXPECT_NEAR(point.y, expected_head[i].y, 0.1); | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The current test verifies the generated vertices against an expected_head vector with a specific order. This makes the test dependent on the implementation details of vertex generation for triangle strips. A change in the vertex generation logic, even if geometrically correct, could break this test.
To make the test more robust and independent of vertex order, I suggest sorting both the actual and expected vertices before comparison. This ensures the test verifies the set of generated points, not their specific order.
| std::vector<Point> expected_head = {Point(300.0, 200.0), Point(300.0, 300.0), | |
| Point(200.0, 200.0), Point(200.0, 300.0)}; | |
| for (size_t i = 0; i < expected_head.size(); i++) { | |
| const Point& point = written_data[i]; | |
| EXPECT_NEAR(point.x, expected_head[i].x, 0.1); | |
| EXPECT_NEAR(point.y, expected_head[i].y, 0.1); | |
| } | |
| std::vector<Point> actual_points; | |
| actual_points.assign(written_data, written_data + result.vertex_buffer.vertex_count); | |
| const std::vector<Point> expected_points = {Point(200.0, 200.0), Point(200.0, 300.0), | |
| Point(300.0, 200.0), Point(300.0, 300.0)}; | |
| auto point_sorter = [](const Point& a, const Point& b) { | |
| if (a.x != b.x) { | |
| return a.x < b.x; | |
| } | |
| return a.y < b.y; | |
| }; | |
| std::sort(actual_points.begin(), actual_points.end(), point_sorter); | |
| ASSERT_EQ(actual_points.size(), expected_points.size()); | |
| for (size_t i = 0; i < expected_points.size(); i++) { | |
| EXPECT_NEAR(actual_points[i].x, expected_points[i].x, 0.1); | |
| EXPECT_NEAR(actual_points[i].y, expected_points[i].y, 0.1); | |
| } |
|
autosubmit label was removed for flutter/flutter/177070, because - The status or check suite Mac tool_integration_tests_1_5 has failed. Please fix the issues identified (or deflake) before re-applying this label. |
|
autosubmit label was removed for flutter/flutter/177070, because - The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label. |
| */ | ||
|
|
||
| if (radius <= 0) { | ||
| if (radius <= kMinRadius) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is also a kEhCloseEnough lol
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought about it and didn't use it in the beginning for mysterious reasons. :)
I've changed it to using kEhCloseEnough and also added a test for radii just greater than kEhCloseEnough.
|
autosubmit label was removed for flutter/flutter/177070, because - The status or check suite Linux linux_host_engine_test has failed. Please fix the issues identified (or deflake) before re-applying this label. |
|
autosubmit label was removed for flutter/flutter/177070, because - The status or check suite Google testing has failed. Please fix the issues identified (or deflake) before re-applying this label. |
d647bc3 to
2460e4d
Compare
flutter/flutter@4c91098...7cf0dc1 2025-10-28 [email protected] Roll Skia from 602bbd4af8f9 to e4d3d8f31aef (4 revisions) (flutter/flutter#177647) 2025-10-28 [email protected] Fix AppBar Semantics namesRoute for mismatched platforms (flutter/flutter#176694) 2025-10-28 [email protected] Fix Popup menu Semantics label for mismatched platforms (flutter/flutter#177049) 2025-10-28 [email protected] Roll Skia from 8b2d056701df to 602bbd4af8f9 (1 revision) (flutter/flutter#177628) 2025-10-28 [email protected] Roll Skia from 5723f87f8530 to 8b2d056701df (3 revisions) (flutter/flutter#177626) 2025-10-27 [email protected] Roll Skia from 170c11f1ddc5 to 5723f87f8530 (6 revisions) (flutter/flutter#177618) 2025-10-27 [email protected] Enhance DropdownMenuEntry's labelWidget docs (flutter/flutter#177160) 2025-10-27 [email protected] Regenerated lockfiles for New Template Values (flutter/flutter#177617) 2025-10-27 [email protected] Correct editable text and placeholder position in baseline aligned stack (flutter/flutter#177342) 2025-10-27 49699333+dependabot[bot]@users.noreply.github.com Bump actions/upload-artifact from 4 to 5 in the all-github-actions group (flutter/flutter#177620) 2025-10-27 [email protected] add gn flag to optimize builds for size (flutter/flutter#176835) 2025-10-27 [email protected] disable metal for crosscompile from mac to linux (flutter/flutter#176639) 2025-10-27 [email protected] [DDM] enable host builds in the merge queue (flutter/flutter#177446) 2025-10-27 [email protected] Disable vulkan X11 support when building for minimal linux (flutter/flutter#176697) 2025-10-27 [email protected] Roll Skia from 77348c40d101 to 170c11f1ddc5 (6 revisions) (flutter/flutter#177602) 2025-10-27 [email protected] Set the font weight variation axis based on the text style's FontWeight (flutter/flutter#175771) 2025-10-27 [email protected] Fixed `RuntimeEffect` with `ImageFilter.compose` (flutter/flutter#177510) 2025-10-27 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Clean before building when framework headers change (#177512)" (flutter/flutter#177610) 2025-10-27 [email protected] [skia] Disable legacy png encoding/decoding in skp (flutter/flutter#177462) 2025-10-27 [email protected] Clean before building when framework headers change (flutter/flutter#177512) 2025-10-27 [email protected] Roll dartdoc to 9.0.0 (flutter/flutter#177590) 2025-10-27 [email protected] Fix typo in comment about `manifestFile` in `DeepLinkJsonFromManifestTaskHelper.kt` (flutter/flutter#177538) 2025-10-27 [email protected] Fix RoundedSuperellipse crashes for tiny corners (flutter/flutter#177070) 2025-10-27 [email protected] Roll Packages from 53d6138 to bbf96a0 (7 revisions) (flutter/flutter#177588) 2025-10-27 [email protected] Fix missing list indicators in CHANGELOG.md (flutter/flutter#177484) 2025-10-27 [email protected] [ Tool ] Add `Stream.transformWithCallSite` to provide more useful stack traces (flutter/flutter#177470) 2025-10-27 [email protected] Roll Skia from 06243224ecf0 to 77348c40d101 (1 revision) (flutter/flutter#177585) 2025-10-27 [email protected] Add guided error for precompiled cache error (flutter/flutter#177327) 2025-10-27 [email protected] Roll Fuchsia Linux SDK from tKrvmvTOQITL81oOC... to ir6J2isKAYa1jNLyJ... (flutter/flutter#177578) 2025-10-27 [email protected] Roll Skia from 784ed1787bd6 to 06243224ecf0 (1 revision) (flutter/flutter#177575) 2025-10-27 [email protected] Roll Skia from de52b3a7585a to 784ed1787bd6 (5 revisions) (flutter/flutter#177571) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Fix #176894 I've verified that the original issue consistently reproduces on my machine and no longer crashes after this PR. ## Pre-launch Checklist - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [ ] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [ ] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
Fix flutter#176894 I've verified that the original issue consistently reproduces on my machine and no longer crashes after this PR. ## Pre-launch Checklist - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [ ] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [ ] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
Fix #176894
I've verified that the original issue consistently reproduces on my machine and no longer crashes after this PR.
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.
Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the
gemini-code-assistbot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.