Attachment 360317 Details for Bug 193894 – Patch

[patch] Patch

Patch.txt (text/plain), 1.78 KB, created by zalan on 2019-01-27 21:50:56 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-01-27 21:50:56 PST

Size: 1.78 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 1f747d0658f..71fc71f16e6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-27  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC][Quirk] Ignore collapsed(through) margin after when stretching body height.
>+        https://bugs.webkit.org/show_bug.cgi?id=193894
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * layout/blockformatting/BlockFormattingContextQuirks.cpp:
>+        (WebCore::Layout::BlockFormattingContext::Quirks::stretchedInFlowHeight):
>+
> 2019-01-26  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Remove redundant vertical positioning in BlockFormattingContext::computeFloatingPosition
>diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp b/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp
>index cffe722e948..a125b6482b0 100644
>--- a/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockFormattingContextQuirks.cpp
>@@ -93,7 +93,8 @@ HeightAndMargin BlockFormattingContext::Quirks::stretchedInFlowHeight(const Layo
> 
>         auto nonCollapsedMargin = heightAndMargin.nonCollapsedMargin;
>         auto collapsedMargin = MarginCollapse::collapsedVerticalValues(layoutState, layoutBox, nonCollapsedMargin);
>-        totalVerticalMargin = collapsedMargin.before.valueOr(nonCollapsedMargin.before) + collapsedMargin.after.valueOr(nonCollapsedMargin.after);
>+        totalVerticalMargin = collapsedMargin.before.valueOr(nonCollapsedMargin.before);
>+        totalVerticalMargin += collapsedMargin.isCollapsedThrough ? nonCollapsedMargin.after : collapsedMargin.after.valueOr(nonCollapsedMargin.after);
>     }
> 
>     // Stretch but never overstretch with the margins.

Actions: View | Formatted Diff | Diff

Attachments on bug 193894: 360317