Attachment 360460 Details for Bug 193964 – Patch

[patch] Patch

bug-193964-20190129074201.patch (text/plain), 3.78 KB, created by zalan on 2019-01-29 07:42:14 PST

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2019-01-29 07:42:14 PST

Size: 3.78 KB

patch

obsolete

>Subversion Revision: 240655
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index e6b3538fee89adc60b5ce76a635dca38236608a2..41a5a1073a6ad00968fb05539dd2c80f16a5a2da 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-29  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC][MarginCollapsing] Remove incorrect downcast<Container>
>+        https://bugs.webkit.org/show_bug.cgi?id=193964
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * layout/blockformatting/BlockMarginCollapse.cpp:
>+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::positiveNegativeMarginBefore):
>+
> 2019-01-29  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Do not ignore next sibling box while laying out BFC.
>diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>index 958ed3574cf804d527f9d23bde2a8149eb5cb0fc..179defb71c2e90e458e95950ce76b8a1f9aca548 100644
>--- a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>@@ -155,7 +155,7 @@ void BlockFormattingContext::placeInFlowPositionedChildren(const Box& layoutBox)
>         if (!childBox.isInFlowPositioned())
>             continue;
> 
>-        auto computeInFlowPositionedPosition = [&]() {
>+        auto computeInFlowPositionedPosition = [&] {
>             auto& layoutState = this->layoutState();
>             auto positionOffset = Geometry::inFlowPositionedPositionOffset(layoutState, childBox);
> 
>diff --git a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>index 4d50145d75e03e9194d5d963ee35640676a99dfb..f7b1c023e9dd2448382489289f8315c14e826d58 100644
>--- a/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp
>@@ -538,7 +538,7 @@ PositiveAndNegativeVerticalMargin::Values BlockFormattingContext::MarginCollapse
>     auto previouSiblingCollapsedMarginAfter = [&]() -> PositiveAndNegativeVerticalMargin::Values {
>         if (!marginBeforeCollapsesWithPreviousSiblingMarginAfter(layoutState, layoutBox))
>             return { };
>-        return positiveNegativeValues(layoutState, *downcast<Container>(layoutBox).previousInFlowSibling(), MarginType::After);
>+        return positiveNegativeValues(layoutState, *layoutBox.previousInFlowSibling(), MarginType::After);
>     };
> 
>     // 1. Gather positive and negative margin values from first child if margins are adjoining.
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 0d0461d937394b3756eda2d6fbfc11db9d034861..b3930b3dd9f4474d7f4fd51a9ea16fd86f2c5698 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,12 @@
>+2019-01-29  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][BFC][MarginCollapsing] Remove incorrect downcast<Container>
>+        https://bugs.webkit.org/show_bug.cgi?id=193964
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * LayoutReloaded/misc/LFC-passing-tests.txt:
>+
> 2019-01-29  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][BFC] Do not ignore next sibling box while laying out BFC.
>diff --git a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>index af555da003967e05859defa7a0e8aefdf165db9b..eda150ddc56abfbacd0cc5c68a24a73890cf9ec1 100644
>--- a/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>+++ b/Tools/LayoutReloaded/misc/LFC-passing-tests.txt
>@@ -149,6 +149,7 @@ fast/block/margin-collapse/043.html
> fast/block/margin-collapse/044.html
> fast/block/margin-collapse/063.html
> fast/block/margin-collapse/100.html
>+fast/block/margin-collapse/101.html
> fast/block/margin-collapse/collapsed-through-child-simple.html
> fast/block/positioning/003.html
> fast/block/positioning/004.html

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193964: 360460