Title: [240093] trunk
Revision
240093
Author
za...@apple.com
Date
2019-01-16 16:17:58 -0800 (Wed, 16 Jan 2019)

Log Message

[LFC][BFC] Inflow non-replaced used width should not be negative.
https://bugs.webkit.org/show_bug.cgi?id=193495

Reviewed by Antti Koivisto.

Source/WebCore:

min-width (initial value 0) enforces non-negative used width.

* layout/blockformatting/BlockFormattingContext.cpp:
(WebCore::Layout::BlockFormattingContext::computeWidthAndMargin const):

Tools:

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (240092 => 240093)


--- trunk/Source/WebCore/ChangeLog	2019-01-17 00:14:38 UTC (rev 240092)
+++ trunk/Source/WebCore/ChangeLog	2019-01-17 00:17:58 UTC (rev 240093)
@@ -1,3 +1,15 @@
+2019-01-16  Zalan Bujtas  <za...@apple.com>
+
+        [LFC][BFC] Inflow non-replaced used width should not be negative.
+        https://bugs.webkit.org/show_bug.cgi?id=193495
+
+        Reviewed by Antti Koivisto.
+
+        min-width (initial value 0) enforces non-negative used width. 
+
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::computeWidthAndMargin const):
+
 2019-01-16  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         [WHLSL] Add a handwritten parser

Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (240092 => 240093)


--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	2019-01-17 00:14:38 UTC (rev 240092)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	2019-01-17 00:17:58 UTC (rev 240093)
@@ -326,11 +326,10 @@
             widthAndMargin = maxWidthAndMargin;
     }
 
-    if (auto minWidth = Geometry::computedValueIfNotAuto(layoutBox.style().logicalMinWidth(), containingBlockWidth)) {
-        auto minWidthAndMargin = compute(minWidth);
-        if (widthAndMargin.width < minWidthAndMargin.width)
-            widthAndMargin = minWidthAndMargin;
-    }
+    auto minWidth = Geometry::computedValueIfNotAuto(layoutBox.style().logicalMinWidth(), containingBlockWidth).valueOr(0);
+    auto minWidthAndMargin = compute(minWidth);
+    if (widthAndMargin.width < minWidthAndMargin.width)
+        widthAndMargin = minWidthAndMargin;
 
     auto& displayBox = layoutState.displayBoxForLayoutBox(layoutBox);
     displayBox.setContentBoxWidth(widthAndMargin.width);

Modified: trunk/Tools/ChangeLog (240092 => 240093)


--- trunk/Tools/ChangeLog	2019-01-17 00:14:38 UTC (rev 240092)
+++ trunk/Tools/ChangeLog	2019-01-17 00:17:58 UTC (rev 240093)
@@ -1,3 +1,12 @@
+2019-01-16  Zalan Bujtas  <za...@apple.com>
+
+        [LFC][BFC] Inflow non-replaced used width should not be negative.
+        https://bugs.webkit.org/show_bug.cgi?id=193495
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2019-01-16  Chris Dumez  <cdu...@apple.com>
 
         Regression(PSON) View becomes blank after click a cross-site download link

Modified: trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt (240092 => 240093)


--- trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt	2019-01-17 00:14:38 UTC (rev 240092)
+++ trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt	2019-01-17 00:17:58 UTC (rev 240093)
@@ -83,6 +83,8 @@
 fast/block/block-only/non-auto-top-bottom-height-with-auto-margins.html
 fast/block/basic/002.html
 fast/block/basic/003.html
+fast/block/basic/004.html
+fast/block/basic/005.html
 fast/block/basic/006.html
 fast/block/basic/007.html
 fast/block/basic/008.html
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to