Changeset 240545 in webkit
- Timestamp:
- Jan 26, 2019 5:13:00 AM (5 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r240544 r240545 1 2019-01-26 Zalan Bujtas <zalan@apple.com> 2 3 [LFC][BFC][MarginCollapsing] marginAfterCollapsesWithParentMarginAfter/marginAfterCollapsesWithLastInFlowChildMarginAfter should check for border/padding after values. 4 https://bugs.webkit.org/show_bug.cgi?id=193864 5 6 Reviewed by Antti Koivisto. 7 8 * layout/blockformatting/BlockMarginCollapse.cpp: 9 (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithParentMarginAfter): 10 (WebCore::Layout::BlockFormattingContext::MarginCollapse::marginAfterCollapsesWithLastInFlowChildMarginAfter): 11 1 12 2019-01-26 Zalan Bujtas <zalan@apple.com> 2 13 -
trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
r240475 r240545 296 296 297 297 // the box has no bottom padding, and 298 if (hasPadding Before(parent))298 if (hasPaddingAfter(parent)) 299 299 return false; 300 300 301 301 // the box has no bottom border, and 302 if (hasBorder Before(parent))302 if (hasBorderAfter(parent)) 303 303 return false; 304 304 … … 338 338 339 339 // the box has no bottom padding, and 340 if (hasPadding Before(layoutBox))340 if (hasPaddingAfter(layoutBox)) 341 341 return false; 342 342 343 343 // the box has no bottom border, and 344 if (hasBorder Before(layoutBox))344 if (hasBorderAfter(layoutBox)) 345 345 return false; 346 346
Note: See TracChangeset
for help on using the changeset viewer.