Changeset 238448 in webkit

Timestamp:

Nov 22, 2018, 10:51:33 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Offset formatting context root runs with horizontal margins.
​https://bugs.webkit.org/show_bug.cgi?id=191900

Reviewed by Antti Koivisto.

Source/WebCore:

Inline runs generated by formatting roots (inline-block) need to be adjusted with the horizontal margins.
(The test case has padding and border as well, but they are _inside_ the formatting context.)

Test: fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html

• layout/inlineformatting/InlineFormattingContext.cpp:

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

Tools:

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

LayoutTests:

• fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt: Added.
• fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html: Added.

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Offset formatting context root runs with horizontal margins.
+        https://bugs.webkit.org/show_bug.cgi?id=191900
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right-expected.txt: Added.
+        * fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html: Added.
+
 2018-11-22  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Offset formatting context root runs with horizontal margins.
+        https://bugs.webkit.org/show_bug.cgi?id=191900
+
+        Reviewed by Antti Koivisto.
+
+        Inline runs generated by formatting roots (inline-block) need to be adjusted with the horizontal margins.
+        (The test case has padding and border as well, but they are _inside_ the formatting context.)
+
+        Test: fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html
+
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::collectInlineContentForSubtree const):
+
 2018-11-22  Simon Fraser  <simon.fraser@apple.com>
 

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

@@ -444 +444 @@
     if (root.establishesFormattingContext() && &root != &(this->root())) {
         createAndAppendInlineItem();
-        inlineFormattingState.inlineContent().last()->addDetachingRule({ InlineItem::DetachingRule::BreakAtStart, InlineItem::DetachingRule::BreakAtEnd });
+        auto& inlineRun = *inlineFormattingState.inlineContent().last();
+
+        auto horizontalMargins = Geometry::computedNonCollapsedHorizontalMarginValue(layoutState(), root);
+        inlineRun.addDetachingRule({ InlineItem::DetachingRule::BreakAtStart, InlineItem::DetachingRule::BreakAtEnd });
+        inlineRun.addNonBreakableStart(horizontalMargins.left);
+        inlineRun.addNonBreakableEnd(horizontalMargins.right);
         // Skip formatting root subtree. They are not part of this inline formatting context.
         return;

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Offset formatting context root runs with horizontal margins.
+        https://bugs.webkit.org/show_bug.cgi?id=191900
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2018-11-22  Philippe Normand  <pnormand@igalia.com>
 

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

@@ -76 +76 @@
 fast/inline/inline-content-with-border-left-right.html
 fast/inline/inline-content-with-margin-left-right.html
+fast/inline/inline-content-and-nested-formatting-root-with-margin-left-right.html
 fast/block/basic/height-percentage-simple.html
 fast/block/basic/child-block-level-box-with-height-percent.html