Attachment 359328 Details for Bug 193495 – Patch

[patch] Patch

bug-193495-20190116160055.patch (text/plain), 3.25 KB, created by zalan on 2019-01-16 16:01:12 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-01-16 16:01:12 PST

Size: 3.25 KB

patch

obsolete

>Subversion Revision: 240050
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 8b3cef233bd6b951eccb0e2ca85b4a10071b436b..ec9f7370c1e322ba83aea29831eef17cd823dff0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-01-16  Zalan Bujtas  <zalan@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  Youenn Fablet  <youenn@apple.com>
> 
>         ServiceWorkerContainer is leaking due to a ref cycle
>diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>index 1f4465aa99f606d9335ebfc43ac0b3bad462d625..18777d39acef7a1e17c7f9c3b71045d2814dfeec 100644
>--- a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>@@ -326,11 +326,10 @@ void BlockFormattingContext::computeWidthAndMargin(const Box& layoutBox) const
>             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);
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 823b08ce4e4f731e372efeddfa9840f40d0a0603..e0875b087f9723eab3833eeade8b7abf4d475f8a 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-16  Zalan Bujtas  <zalan@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  <cdumez@apple.com>
> 
>         Regression(PSON) View becomes blank after click a cross-site download link
>diff --git a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>index 494526438b2b6202212c32d089aefb65dcc41ed2..4695f112c9cde690222b8c6b1ad5b20a8d72a086 100644
>--- a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>+++ b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>@@ -83,6 +83,8 @@ fast/block/block-only/non-auto-top-bottom-height-with-margins.html
> 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

Actions: View | Formatted Diff | Diff

Attachments on bug 193495: 359268 | 359328