Title: [245792] trunk/Source/WebCore
- Revision
- 245792
- Author
- [email protected]
- Date
- 2019-05-27 07:15:18 -0700 (Mon, 27 May 2019)
Log Message
[LFC][IFC] Ignore collapsed runs when setting the width on the associated display boxes.
https://bugs.webkit.org/show_bug.cgi?id=198260
<rdar://problem/51145704>
Reviewed by Antti Koivisto.
Collapsed runs don't contribute to the logical width of their containers.
Covered by existing tests.
* layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
(WebCore::Layout::InlineFormattingContext::LineLayout::closeLine const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (245791 => 245792)
--- trunk/Source/WebCore/ChangeLog 2019-05-27 09:55:23 UTC (rev 245791)
+++ trunk/Source/WebCore/ChangeLog 2019-05-27 14:15:18 UTC (rev 245792)
@@ -1,3 +1,18 @@
+2019-05-27 Zalan Bujtas <[email protected]>
+
+ [LFC][IFC] Ignore collapsed runs when setting the width on the associated display boxes.
+ https://bugs.webkit.org/show_bug.cgi?id=198260
+ <rdar://problem/51145704>
+
+ Reviewed by Antti Koivisto.
+
+ Collapsed runs don't contribute to the logical width of their containers.
+
+ Covered by existing tests.
+
+ * layout/inlineformatting/InlineFormattingContextLineLayout.cpp:
+ (WebCore::Layout::InlineFormattingContext::LineLayout::closeLine const):
+
2019-05-27 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix GTK distcheck
Modified: trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp (245791 => 245792)
--- trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp 2019-05-27 09:55:23 UTC (rev 245791)
+++ trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContextLineLayout.cpp 2019-05-27 14:15:18 UTC (rev 245792)
@@ -543,9 +543,9 @@
if (firstInlineRunForLayoutBox) {
// Setup display box for the associated layout box.
displayBox.setTopLeft(inlineRun.logicalTopLeft());
- displayBox.setContentBoxWidth(inlineRun.logicalWidth());
+ displayBox.setContentBoxWidth(lineItem->isCollapsed ? LayoutUnit() : inlineRun.logicalWidth());
displayBox.setContentBoxHeight(inlineRun.logicalHeight());
- } else {
+ } else if (!lineItem->isCollapsed) {
// FIXME fix it for multirun/multiline.
displayBox.setContentBoxWidth(displayBox.contentBoxWidth() + inlineRun.logicalWidth());
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
