Changeset 238430 in webkit
- Timestamp:
- Nov 21, 2018 3:13:22 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r238429 r238430 1 2018-11-21 Zalan Bujtas <zalan@apple.com> 2 3 [LFC][IFC] Horizontal margins should be considered as non-breakable space 4 https://bugs.webkit.org/show_bug.cgi?id=191894 5 6 Reviewed by Antti Koivisto. 7 8 * fast/inline/inline-content-with-margin-left-right-expected.txt: Added. 9 * fast/inline/inline-content-with-margin-left-right.html: Added. 10 1 11 2018-11-21 Ryosuke Niwa <rniwa@webkit.org> 2 12 -
trunk/Source/WebCore/ChangeLog
r238429 r238430 1 2018-11-21 Zalan Bujtas <zalan@apple.com> 2 3 [LFC][IFC] Horizontal margins should be considered as non-breakable space 4 https://bugs.webkit.org/show_bug.cgi?id=191894 5 6 Reviewed by Antti Koivisto. 7 8 Like padding and border, horizontal margins also force run breaks and offset them. 9 10 Test: fast/inline/inline-content-with-margin-left-right.html 11 12 * layout/inlineformatting/InlineFormattingContext.cpp: 13 (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const): 14 1 15 2018-11-20 Ryosuke Niwa <rniwa@webkit.org> 2 16 -
trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp
r238422 r238430 464 464 auto padding = Geometry::computedPadding(layoutState(), root); 465 465 auto border = Geometry::computedBorder(layoutState(), root); 466 auto horizontalMargins = Geometry::computedNonCollapsedHorizontalMarginValue(layoutState(), root); 466 467 // Setup breaking boundaries for this subtree. 467 468 auto* lastDescendantInlineBox = inlineFormattingState.lastInlineItem(); … … 473 474 if (&root == &(this->root())) 474 475 return false; 475 return (padding && padding->horizontal.left) || border.horizontal.left || root.isPositioned();476 return (padding && padding->horizontal.left) || border.horizontal.left || horizontalMargins.left || root.isPositioned(); 476 477 }; 477 478 … … 479 480 if (&root == &(this->root())) 480 481 return false; 481 return (padding && padding->horizontal.right) || border.horizontal.right || root.isPositioned();482 return (padding && padding->horizontal.right) || border.horizontal.right || horizontalMargins.right || root.isPositioned(); 482 483 }; 483 484 … … 497 498 firstDescendantInlineBox->addNonBreakableStart(padding->horizontal.left); 498 499 firstDescendantInlineBox->addNonBreakableStart(border.horizontal.left); 500 firstDescendantInlineBox->addNonBreakableStart(horizontalMargins.left); 499 501 } 500 502 … … 504 506 lastDescendantInlineBox->addNonBreakableEnd(padding->horizontal.right); 505 507 lastDescendantInlineBox->addNonBreakableEnd(border.horizontal.right); 508 lastDescendantInlineBox->addNonBreakableEnd(horizontalMargins.right); 506 509 } 507 510 } -
trunk/Tools/ChangeLog
r238422 r238430 1 2018-11-21 Zalan Bujtas <zalan@apple.com> 2 3 [LFC][IFC] Horizontal margins should be considered as non-breakable space 4 https://bugs.webkit.org/show_bug.cgi?id=191894 5 6 Reviewed by Antti Koivisto. 7 8 * LayoutReloaded/misc/LFC-passing-tests.txt: 9 1 10 2018-11-21 Zalan Bujtas <zalan@apple.com> 2 11 -
trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
r238422 r238430 75 75 fast/inline/inline-content-with-padding-left-right.html 76 76 fast/inline/inline-content-with-border-left-right.html 77 fast/inline/inline-content-with-margin-left-right.html 77 78 fast/block/basic/height-percentage-simple.html 78 79 fast/block/basic/child-block-level-box-with-height-percent.html
Note: See TracChangeset
for help on using the changeset viewer.