Changeset 238422 in webkit

Timestamp:

Nov 21, 2018 9:38:08 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Border should be considered as non-breakable space
​https://bugs.webkit.org/show_bug.cgi?id=191891

Reviewed by Antti Koivisto.

Source/WebCore:

Like padding, border also forces run breaks and offsets them.

Test: fast/inline/inline-content-with-border-left-right.html

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):

Tools:

• LayoutReloaded/misc/LFC-passing-tests.txt:

LayoutTests:

• fast/inline/inline-content-with-border-left-right-expected.txt: Added.
• fast/inline/inline-content-with-border-left-right.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/inline-content-with-border-left-right-expected.txt (added)
• LayoutTests/fast/inline/inline-content-with-border-left-right.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/LayoutReloaded/misc/LFC-passing-tests.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-21  Zalan Bujtas <zalan@apple.com>
+
+        [LFC][IFC] Border should be considered as non-breakable space
+        https://bugs.webkit.org/show_bug.cgi?id=191891
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/inline-content-with-border-left-right-expected.txt: Added.
+        * fast/inline/inline-content-with-border-left-right.html: Added.
+
 2018-11-21  Alicia Boya García  <aboya@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Border should be considered as non-breakable space
+        https://bugs.webkit.org/show_bug.cgi?id=191891
+
+        Reviewed by Antti Koivisto.
+
+        Like padding, border also forces run breaks and offsets them.
+
+        Test: fast/inline/inline-content-with-border-left-right.html
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+
 2018-11-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

@@ -463 +463 @@
     // FIXME: Revisit this when we figured out how inline boxes fit the display tree.
     auto padding = Geometry::computedPadding(layoutState(), root);
+    auto border = Geometry::computedBorder(layoutState(), root);
     // Setup breaking boundaries for this subtree.
     auto* lastDescendantInlineBox = inlineFormattingState.lastInlineItem();
@@ -470 +471 @@
 
     auto rootBreaksAtStart = [&] {
-        // FIXME: add padding-inline-start, margin-inline-start etc.
-        if (padding && padding->horizontal.left)
-            return true;
-        return root.isPositioned();
+        if (&root == &(this->root()))
+            return false;
+        return (padding && padding->horizontal.left) || border.horizontal.left || root.isPositioned();
     };
 
     auto rootBreaksAtEnd = [&] {
-        // FIXME: add padding-inline-end, margin-inline-end etc.
-        if (padding && padding->horizontal.right)
-            return true;
-        return root.isPositioned();
+        if (&root == &(this->root()))
+            return false;
+        return (padding && padding->horizontal.right) || border.horizontal.right || root.isPositioned();
     };
 
@@ -495 +494 @@
         ASSERT(firstDescendantInlineBox);
         firstDescendantInlineBox->addDetachingRule(InlineItem::DetachingRule::BreakAtStart);
-        if (padding && padding->horizontal.left)
+        if (padding)
             firstDescendantInlineBox->addNonBreakableStart(padding->horizontal.left);
+        firstDescendantInlineBox->addNonBreakableStart(border.horizontal.left);
     }
 
     if (rootBreaksAtEnd()) {
         lastDescendantInlineBox->addDetachingRule(InlineItem::DetachingRule::BreakAtEnd);
-        if (padding && padding->horizontal.right)
+        if (padding)
             lastDescendantInlineBox->addNonBreakableEnd(padding->horizontal.right);
+        lastDescendantInlineBox->addNonBreakableEnd(border.horizontal.right);
     }
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-21  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Border should be considered as non-breakable space
+        https://bugs.webkit.org/show_bug.cgi?id=191891
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2018-11-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt

@@ -74 +74 @@
 fast/inline/simple-inline-with-out-of-flow-descendant2.html
 fast/inline/inline-content-with-padding-left-right.html
+fast/inline/inline-content-with-border-left-right.html
 fast/block/basic/height-percentage-simple.html
 fast/block/basic/child-block-level-box-with-height-percent.html