Title: [240656] trunk
Revision
240656
Author
[email protected]
Date
2019-01-29 07:53:30 -0800 (Tue, 29 Jan 2019)

Log Message

[LFC][BFC][MarginCollapsing] Remove incorrect downcast<Container>
https://bugs.webkit.org/show_bug.cgi?id=193964

Reviewed by Antti Koivisto.

Source/WebCore:

* layout/blockformatting/BlockMarginCollapse.cpp:
(WebCore::Layout::BlockFormattingContext::MarginCollapse::positiveNegativeMarginBefore):

Tools:

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (240655 => 240656)


--- trunk/Source/WebCore/ChangeLog	2019-01-29 14:58:05 UTC (rev 240655)
+++ trunk/Source/WebCore/ChangeLog	2019-01-29 15:53:30 UTC (rev 240656)
@@ -1,5 +1,15 @@
 2019-01-29  Zalan Bujtas  <[email protected]>
 
+        [LFC][BFC][MarginCollapsing] Remove incorrect downcast<Container>
+        https://bugs.webkit.org/show_bug.cgi?id=193964
+
+        Reviewed by Antti Koivisto.
+
+        * layout/blockformatting/BlockMarginCollapse.cpp:
+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::positiveNegativeMarginBefore):
+
+2019-01-29  Zalan Bujtas  <[email protected]>
+
         [LFC][BFC] Do not ignore next sibling box while laying out BFC.
         https://bugs.webkit.org/show_bug.cgi?id=193954
 

Modified: trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp (240655 => 240656)


--- trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	2019-01-29 14:58:05 UTC (rev 240655)
+++ trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	2019-01-29 15:53:30 UTC (rev 240656)
@@ -155,7 +155,7 @@
         if (!childBox.isInFlowPositioned())
             continue;
 
-        auto computeInFlowPositionedPosition = [&]() {
+        auto computeInFlowPositionedPosition = [&] {
             auto& layoutState = this->layoutState();
             auto positionOffset = Geometry::inFlowPositionedPositionOffset(layoutState, childBox);
 

Modified: trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp (240655 => 240656)


--- trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp	2019-01-29 14:58:05 UTC (rev 240655)
+++ trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp	2019-01-29 15:53:30 UTC (rev 240656)
@@ -538,7 +538,7 @@
     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.

Modified: trunk/Tools/ChangeLog (240655 => 240656)


--- trunk/Tools/ChangeLog	2019-01-29 14:58:05 UTC (rev 240655)
+++ trunk/Tools/ChangeLog	2019-01-29 15:53:30 UTC (rev 240656)
@@ -1,5 +1,14 @@
 2019-01-29  Zalan Bujtas  <[email protected]>
 
+        [LFC][BFC][MarginCollapsing] Remove incorrect downcast<Container>
+        https://bugs.webkit.org/show_bug.cgi?id=193964
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
+2019-01-29  Zalan Bujtas  <[email protected]>
+
         [LFC][BFC] Do not ignore next sibling box while laying out BFC.
         https://bugs.webkit.org/show_bug.cgi?id=193954
 

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


--- trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt	2019-01-29 14:58:05 UTC (rev 240655)
+++ trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt	2019-01-29 15:53:30 UTC (rev 240656)
@@ -149,6 +149,7 @@
 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to