Changeset 240035 in webkit
- Timestamp:
- Jan 16, 2019 6:52:55 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r240027 r240035 1 2019-01-16 Zalan Bujtas <zalan@apple.com> 2 3 [LFC] Adjust margin box verification. 4 https://bugs.webkit.org/show_bug.cgi?id=193482 5 6 Reviewed by Antti Koivisto. 7 8 * fast/block/block-only/non-auto-top-bottom-height-with-auto-margins-expected.txt: Added. 9 * fast/block/block-only/non-auto-top-bottom-height-with-auto-margins.html: Added. 10 1 11 2019-01-15 Ryosuke Niwa <rniwa@webkit.org> 2 12 -
trunk/Source/WebCore/ChangeLog
r240034 r240035 1 2019-01-16 Alan Kinsley <zalan@apple.com> 2 3 [LFC] Adjust margin box verification. 4 https://bugs.webkit.org/show_bug.cgi?id=193482 5 6 Reviewed by Antti Koivisto. 7 8 In certain cases, like out-of-flow boxes with margin auto, marginBoxRect() returns 0. It's clearly incorrect, 9 so let's check the individual margin values instead (and at this point we know that all other boxes match). 10 11 Test: fast/block/block-only/non-auto-top-bottom-height-with-auto-margins.html 12 13 * layout/Verification.cpp: 14 (WebCore::Layout::outputMismatchingBlockBoxInformationIfNeeded): 15 1 16 2019-01-16 Zan Dobersek <zdobersek@igalia.com> 2 17 -
trunk/Source/WebCore/layout/Verification.cpp
r239609 r240035 266 266 } 267 267 268 if (renderer.marginBoxRect() != renderBoxLikeMarginBox(displayBox)) {269 outputRect("marginBox", renderer.marginBoxRect(), renderBoxLikeMarginBox(displayBox));270 return true;271 }272 273 268 if (renderer.borderBoxRect() != displayBox.borderBox()) { 274 269 outputRect("borderBox", renderer.borderBoxRect(), displayBox.borderBox()); … … 284 279 outputRect("contentBox", renderer.contentBoxRect(), displayBox.contentBox()); 285 280 return true; 281 } 282 283 if (renderer.marginBoxRect() != renderBoxLikeMarginBox(displayBox)) { 284 // In certain cases, like out-of-flow boxes with margin auto, marginBoxRect() returns 0. It's clearly incorrect, 285 // so let's check the individual margin values instead (and at this point we know that all other boxes match). 286 auto marginsMatch = displayBox.marginBefore() == renderer.marginBefore() 287 && displayBox.marginAfter() == renderer.marginAfter() 288 && displayBox.marginStart() == renderer.marginStart() 289 && displayBox.marginEnd() == renderer.marginEnd(); 290 291 if (!marginsMatch) { 292 outputRect("marginBox", renderer.marginBoxRect(), renderBoxLikeMarginBox(displayBox)); 293 return true; 294 } 286 295 } 287 296 -
trunk/Tools/ChangeLog
r240025 r240035 1 2019-01-16 Zalan Bujtas <zalan@apple.com> 2 3 [LFC] Adjust margin box verification. 4 https://bugs.webkit.org/show_bug.cgi?id=193482 5 6 Reviewed by Antti Koivisto. 7 8 * LayoutReloaded/misc/LFC-passing-tests.txt: 9 1 10 2019-01-15 Sihui Liu <sihui_liu@apple.com> 2 11 -
trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
r239991 r240035 80 80 fast/block/block-only/out-of-flow-with-containing-block-border-padding.html 81 81 fast/block/block-only/non-auto-top-bottom-left-right-widht-height-out-of-flow.html 82 fast/block/block-only/non-auto-top-bottom-height-with-auto-margins.html 82 83 fast/block/basic/002.html 83 84 fast/block/basic/003.html
Note: See TracChangeset
for help on using the changeset viewer.