Attachment 359334 Details for Bug 193520 – Patch

[patch] Patch

bug-193520-20190116164020.patch (text/plain), 3.46 KB, created by zalan on 2019-01-16 16:40:36 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-01-16 16:40:36 PST

Size: 3.46 KB

patch

obsolete

>Subversion Revision: 240094
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fb20d47d0281f345cc872017513599b5f3a70376..12930e7e535adaa9d659d7decbad30b51bdb50a2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-01-16  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC] For height computation, the bottom edge of the last line box value should not include top border/padding
>+        https://bugs.webkit.org/show_bug.cgi?id=193520
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is similar to the other "10.6.3" cases. The bottom edge of the last inline box is in the coordinate systyem
>+        of the containing block's border box (and for content height computation it needs to be mapped to the containing block's content box instead).
>+
>+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
>+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMargin):
>+
> 2019-01-16  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Inflow non-replaced used width should not be negative.
>diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp b/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
>index f9cc7d39a7b69014e83989e1c8850353a3dbd96a..f68dda3cbd317ed801410418b8ad7ca497b5cd18 100644
>--- a/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp
>@@ -77,7 +77,7 @@ HeightAndMargin BlockFormattingContext::Geometry::inFlowNonReplacedHeightAndMarg
>             // This is temp and will be replaced by the correct display box once inline runs move over to the display tree.
>             auto& inlineRuns = downcast<InlineFormattingState>(layoutState.establishedFormattingState(layoutBox)).inlineRuns();
>             auto bottomEdge = inlineRuns.isEmpty() ? LayoutUnit() : inlineRuns.last().logicalBottom();
>-            return { bottomEdge, nonCollapsedMargin };
>+            return { bottomEdge - borderAndPaddingTop, nonCollapsedMargin };
>         }
> 
>         // 2. the bottom edge of the bottom (possibly collapsed) margin of its last in-flow child, if the child's bottom margin...
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e0875b087f9723eab3833eeade8b7abf4d475f8a..ac98c4bba7400c19371440177a74c715a73afb76 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-16  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC] For height computation, the bottom edge of the last line box value should include top border/padding
>+        https://bugs.webkit.org/show_bug.cgi?id=193520
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * LayoutReloaded/misc/LFC-passing-tests.txt:
>+
> 2019-01-16  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Inflow non-replaced used width should not be negative.
>diff --git a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>index 4695f112c9cde690222b8c6b1ad5b20a8d72a086..bfa0eff1d024fd5c1b7ca976107577cdb9c2251b 100644
>--- a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>+++ b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>@@ -90,6 +90,7 @@ fast/block/basic/007.html
> fast/block/basic/008.html
> fast/block/basic/009.html
> fast/block/basic/012.html
>+fast/block/basic/021.html
> fast/block/basic/child-block-level-box-with-height-percent.html
> fast/block/basic/height-percentage-simple.html
> fast/block/basic/inline-content-with-floating-image.html

Actions: View | Formatted Diff | Diff

Attachments on bug 193520: 359334