Changeset 238493 in webkit

Timestamp:

Nov 26, 2018, 7:23:44 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC][IFC] Use float box's margin box to adjust the line constraints.
​https://bugs.webkit.org/show_bug.cgi?id=191961

Reviewed by Antti Koivisto.

Source/WebCore:

Test: fast/inline/inline-content-with-float-and-margin.html

(WebCore::Layout::outputMismatchingComplexLineInformationIfNeeded):
(WebCore::Layout::LayoutState::verifyAndOutputMismatchingLayoutTree const):

• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::layoutInlineContent const):

Tools:

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

LayoutTests:

• fast/inline/inline-content-with-float-and-margin-expected.txt: Added.
• fast/inline/inline-content-with-float-and-margin.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/inline/inline-content-with-float-and-margin-expected.txt (added)
• LayoutTests/fast/inline/inline-content-with-float-and-margin.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-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Use float box's margin box to adjust the line constraints.
+        https://bugs.webkit.org/show_bug.cgi?id=191961
+
+        Reviewed by Antti Koivisto.
+
+        * fast/inline/inline-content-with-float-and-margin-expected.txt: Added.
+        * fast/inline/inline-content-with-float-and-margin.html: Added.
+
 2018-11-26  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Use float box's margin box to adjust the line constraints.
+        https://bugs.webkit.org/show_bug.cgi?id=191961
+
+        Reviewed by Antti Koivisto.
+
+        Test: fast/inline/inline-content-with-float-and-margin.html
+
+        (WebCore::Layout::outputMismatchingComplexLineInformationIfNeeded):
+        (WebCore::Layout::LayoutState::verifyAndOutputMismatchingLayoutTree const):
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::layoutInlineContent const):
+
 2018-11-26  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -288 +288 @@
             inlineFormattingState.floatingState().append(floatBox);
 
-            auto floatBoxWidth = layoutState.displayBoxForLayoutBox(floatBox).width();
+            auto floatBoxWidth = layoutState.displayBoxForLayoutBox(floatBox).marginBox().width();
             // Shrink availble space for current line and move existing inline runs.
             floatBox.isLeftFloatingPositioned() ? line.adjustLogicalLeft(floatBoxWidth) : line.adjustLogicalRight(floatBoxWidth);

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][IFC] Use float box's margin box to adjust the line constraints.
+        https://bugs.webkit.org/show_bug.cgi?id=191961
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2018-11-25  Zalan Bujtas  <zalan@apple.com>
 

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

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