Assertion in WebCore::calculateAdjustedInnerBorder() #6138
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
EWS run on previous version of this PR (hash 1406ffa) |
vitorroriz
force-pushed
the
eng/assertion-in-calculateAdjustedInnerBorder
branch
from
1406ffa
to
e984cbc
Compare
|
EWS run on previous version of this PR (hash e984cbc)
|
anttijk
requested changes
Nov 7, 2022
Comment on lines
1
to
6
| layer at (0,0) size 800x600 | ||
| RenderView at (0,0) size 800x600 | ||
| layer at (0,0) size 800x600 | ||
| RenderBlock {HTML} at (0,0) size 800x600 | ||
| RenderBody {BODY} at (8,8) size 784x584 | ||
| RenderBlock {DIV} at (0,0) size 300x243 [bgcolor=#B8860B] [border: none (100px solid #FF0000) (43px solid #000000) none] |
There was a problem hiding this comment.
Please don't create new render tree dump based tests, they are annoying to maintain as they are very sensitive to unrelated changes.
Instead this should likely be a reftest where you add an -expected.html file that the test result gets pixel-compared against. For non-visual things a text based test (testRunner.dumpAsText()) can be used.
vitorroriz
force-pushed
the
eng/assertion-in-calculateAdjustedInnerBorder
branch
from
e984cbc
to
e0711e8
Compare
|
EWS run on previous version of this PR (hash e0711e8)
|
anttijk
approved these changes
Nov 8, 2022
anttijk
approved these changes
Nov 8, 2022
Comment on lines
1
to
18
| <html> | ||
| <head> | ||
| <link rel="help" href="https://developer.mozilla.org/en-US/docs/Web/CSS/border-top-right-radius"> | ||
| <style> | ||
| .class4 { | ||
| /* bug happens when width < border-bottom-left-radius + border-bottom-right-radius (horizontal) with vertical axis of the elipse values set to 0 */ | ||
| border-bottom: solid; | ||
| width: 200px; | ||
| height: 200px; | ||
| background-color: darkgoldenrod; | ||
| border-right: 100px solid red; | ||
| border-bottom-width: 43px; | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div class="class4"></div> | ||
| </body> |
There was a problem hiding this comment.
You don't need to add -ref.html except for WPT tests.
vitorroriz
force-pushed
the
eng/assertion-in-calculateAdjustedInnerBorder
branch
from
e0711e8
to
f3ae352
Compare
|
EWS run on current version of this PR (hash f3ae352)
|
https://bugs.webkit.org/show_bug.cgi?id=247569 rdar://99885016 Reviewed by Antti Koivisto. The adjusting function calculateAdjustedInnerBorder assumes it will be called only when: [1]: the radii of one of the vertex of the edge we are painting is zero. In BorderPainter::paintBorderSides(...), when borderWillArcInnerEdge(...) evaluates to true, a path would be used for calling paintOneBorderSide(...) which would result in calculateAdjustedInnerBorder being called when [1] does not hold for the test added here. borderWillArcInnerEdge return trues if one of the radius it receives isZero(), however isZero() checks that both height and width of the radius are zero, while one of them being zero would already invalidate rendering the border as rounded, as described by https://w3c.github.io/csswg-drafts/css-backgrounds/#border-radii Therefore, we propose changing borderWillArcInnerEdge to use isEmpty(), that checks that the height or width of the radius is zero. * LayoutTests/css3/calc/inner-border-radius-longer-than-width.html: Added. * LayoutTests/css3/calc/inner-border-radius-longer-than-width-expected.html: Added. This test would trigger the following assertion on calculateAdjustedInnerBorder(): 'ASSERT(!(newRadii.bottomLeft().width() && newRadii.bottomRight().width()));' * Source/WebCore/rendering/style/BorderData.h: (WebCore::BorderData::hasBorderRadius const): * Source/WebCore/display/css/DisplayBoxDecorationPainter.cpp: (WebCore::Display::BorderPainter::borderWillArcInnerEdge): * Source/WebCore/rendering/BorderPainter.cpp: (WebCore::borderWillArcInnerEdge): borderWillArchInnerEdge() and hasBorderRadius() uses now isEmpty() instead of isZero(), since isEmpty() checks if either the height or width of the radius is zero. Canonical link: https://commits.webkit.org/256445@main
webkit-commit-queue
force-pushed
the
eng/assertion-in-calculateAdjustedInnerBorder
branch
from
f3ae352
to
bdb44a7
Compare
|
Committed 256445@main (bdb44a7): https://commits.webkit.org/256445@main Reviewed commits have been landed. Closing PR #6138 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
bdb44a7
f3ae352
🛠 🧪 win🧪 ios-wk2🧪 gtk-wk2🧪 api-ios🧪 mac-wk1🧪 mac-AS-debug-wk2