Changeset 235561 in webkit

Timestamp:

Aug 31, 2018, 11:07:46 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC] Add margin box verification back now that Display::Box has non-computed horizontal margin.
​https://bugs.webkit.org/show_bug.cgi?id=189193

Reviewed by Antti Koivisto.

Source/WebCore:

Use the non-computed margin values to verify correctness.
This patch also fixes a margin collapsing issue when the inflow box has a float sibling. The float
sibling does not prevent collapsing with the parent's top/bottom margin.

Test: fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border.html

• layout/Verification.cpp:

(WebCore::Layout::outputMismatchingBlockBoxInformationIfNeeded):
(WebCore::Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree const):

• layout/blockformatting/BlockMarginCollapse.cpp:

(WebCore::Layout::isMarginTopCollapsedWithParent):
(WebCore::Layout::BlockFormattingContext::MarginCollapse::isMarginBottomCollapsedWithParent):

Tools:

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

LayoutTests:

• fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border-expected.txt: Added.
• fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border-expected.txt (added)
• LayoutTests/fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/Verification.cpp (modified) (3 diffs)
• Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/LayoutReloaded/misc/LFC-passing-tests.txt (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-08-31  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Add margin box verification back now that Display::Box has non-computed horizontal margin.
+        https://bugs.webkit.org/show_bug.cgi?id=189193
+
+        Reviewed by Antti Koivisto.
+
+        * fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border-expected.txt: Added.
+        * fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border.html: Added.
+
 2018-08-31  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-08-31  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Add margin box verification back now that Display::Box has non-computed horizontal margin.
+        https://bugs.webkit.org/show_bug.cgi?id=189193
+
+        Reviewed by Antti Koivisto.
+
+        Use the non-computed margin values to verify correctness.
+        This patch also fixes a margin collapsing issue when the inflow box has a float sibling. The float
+        sibling does not prevent collapsing with the parent's top/bottom margin.
+
+        Test: fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border.html
+
+        * layout/Verification.cpp:
+        (WebCore::Layout::outputMismatchingBlockBoxInformationIfNeeded):
+        (WebCore::Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree const):
+        * layout/blockformatting/BlockMarginCollapse.cpp:
+        (WebCore::Layout::isMarginTopCollapsedWithParent):
+        (WebCore::Layout::BlockFormattingContext::MarginCollapse::isMarginBottomCollapsedWithParent):
+
 2018-08-31  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/layout/Verification.cpp

@@ -122 +122 @@
     };
 
+    auto renderBoxLikeMarginBox = [](auto& displayBox) {
+        // Produce a RenderBox matching margin box.
+        auto borderBox = displayBox.borderBox();
+
+        return Display::Box::Rect {
+            borderBox.top() - displayBox.nonCollapsedMarginTop(),
+            borderBox.left() - displayBox.nonComputedMarginLeft(),
+            displayBox.nonComputedMarginLeft() + borderBox.width() + displayBox.nonComputedMarginRight(),
+            displayBox.nonCollapsedMarginTop() + borderBox.height() + displayBox.nonCollapsedMarginBottom()
+        };
+    };
+
     auto* displayBox = context.displayBoxForLayoutBox(layoutBox);
     ASSERT(displayBox);
@@ -135 +147 @@
     }
 
+    if (renderer.marginBoxRect() != renderBoxLikeMarginBox(*displayBox)) {
+        outputRect("marginBox", renderer.marginBoxRect(), renderBoxLikeMarginBox(*displayBox));
+        return true;
+    }
+
     if (renderer.borderBoxRect() != displayBox->borderBox()) {
         outputRect("borderBox", renderer.borderBoxRect(), displayBox->borderBox());
@@ -150 +167 @@
     }
 
-    // TODO: The RenderBox::marginBox() does not follow the spec and ignores certain constraints. Skip them for now.
     return false;
 }

trunk/Source/WebCore/layout/blockformatting/BlockMarginCollapse.cpp

@@ -98 +98 @@
     ASSERT(layoutBox.parent());
     auto& parent = *layoutBox.parent();
-    // Only the first inlflow child collapses with parent (floating sibling also prevents collapsing). 
-    if (layoutBox.previousInFlowOrFloatingSibling())
+    // Only the first inlflow child collapses with parent.
+    if (layoutBox.previousInFlowSibling())
         return false;
 
@@ -275 +275 @@
     ASSERT(layoutBox.parent());
     auto& parent = *layoutBox.parent();
-    // Only the last inlflow child collapses with parent (floating sibling also prevents collapsing). 
-    if (layoutBox.nextInFlowOrFloatingSibling())
+    // Only the last inlflow child collapses with parent.
+    if (layoutBox.nextInFlowSibling())
         return false;
 

trunk/Tools/ChangeLog

@@ +1 @@
+2018-08-31  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Add margin box verification back now that Display::Box has non-computed horizontal margin.
+        https://bugs.webkit.org/show_bug.cgi?id=189193
+
+        Reviewed by Antti Koivisto.
+
+        * LayoutReloaded/misc/LFC-passing-tests.txt:
+
 2018-08-31  Antti Koivisto  <antti@apple.com>
 

trunk/Tools/LayoutReloaded/misc/LFC-passing-tests.txt

@@ -48 +48 @@
 fast/block/block-only/floating-multiple-lefts.html
 fast/block/block-only/floating-and-next-previous-inflow-with-margin.html
+fast/block/block-only/floating-and-next-previous-inflow-with-margin-with-no-border.html
 fast/block/block-only/floating-left-and-right-with-clearance.html
 fast/block/block-only/float-and-siblings-with-margins.html