Title: [238449] trunk/Source/WebCore
- Revision
- 238449
- Author
- [email protected]
- Date
- 2018-11-22 10:56:28 -0800 (Thu, 22 Nov 2018)
Log Message
[LFC][IFC] Merge addNonBreakableStart/NonBreakableEnd calls.
https://bugs.webkit.org/show_bug.cgi?id=191903
Reviewed by Antti Koivisto.
* layout/inlineformatting/InlineFormattingContext.cpp:
(WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (238448 => 238449)
--- trunk/Source/WebCore/ChangeLog 2018-11-22 18:51:33 UTC (rev 238448)
+++ trunk/Source/WebCore/ChangeLog 2018-11-22 18:56:28 UTC (rev 238449)
@@ -1,5 +1,15 @@
2018-11-22 Zalan Bujtas <[email protected]>
+ [LFC][IFC] Merge addNonBreakableStart/NonBreakableEnd calls.
+ https://bugs.webkit.org/show_bug.cgi?id=191903
+
+ Reviewed by Antti Koivisto.
+
+ * layout/inlineformatting/InlineFormattingContext.cpp:
+ (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+
+2018-11-22 Zalan Bujtas <[email protected]>
+
[LFC][IFC] Offset formatting context root runs with horizontal margins.
https://bugs.webkit.org/show_bug.cgi?id=191900
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (238448 => 238449)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-11-22 18:51:33 UTC (rev 238448)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp 2018-11-22 18:56:28 UTC (rev 238449)
@@ -499,18 +499,18 @@
ASSERT(firstDescendantInlineBox);
firstDescendantInlineBox->addDetachingRule(InlineItem::DetachingRule::BreakAtStart);
+ auto startOffset = border.horizontal.left + horizontalMargins.left;
if (padding)
- firstDescendantInlineBox->addNonBreakableStart(padding->horizontal.left);
- firstDescendantInlineBox->addNonBreakableStart(border.horizontal.left);
- firstDescendantInlineBox->addNonBreakableStart(horizontalMargins.left);
+ startOffset += padding->horizontal.left;
+ firstDescendantInlineBox->addNonBreakableStart(startOffset);
}
if (rootBreaksAtEnd()) {
lastDescendantInlineBox->addDetachingRule(InlineItem::DetachingRule::BreakAtEnd);
+ auto endOffset = border.horizontal.right + horizontalMargins.right;
if (padding)
- lastDescendantInlineBox->addNonBreakableEnd(padding->horizontal.right);
- lastDescendantInlineBox->addNonBreakableEnd(border.horizontal.right);
- lastDescendantInlineBox->addNonBreakableEnd(horizontalMargins.right);
+ endOffset += padding->horizontal.right;
+ lastDescendantInlineBox->addNonBreakableEnd(endOffset);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
