Changeset 264169 in webkit

Timestamp:

Jul 9, 2020, 7:33:50 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][Verification] Use the table wrapper box's margin when checking the table box
​https://bugs.webkit.org/show_bug.cgi?id=214119

Reviewed by Darin Adler.

Source/WebCore:

Table margins are propagated to the table wrapper box.

Test: fast/layoutformattingcontext/table-with-margin-simple.html

• layout/Verification.cpp:

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

LayoutTests:

• fast/layoutformattingcontext/table-with-margin-simple-expected.html: Added.
• fast/layoutformattingcontext/table-with-margin-simple.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/layoutformattingcontext/table-with-margin-simple-expected.html (added)
• LayoutTests/fast/layoutformattingcontext/table-with-margin-simple.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/Verification.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-07-09  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Verification] Use the table wrapper box's margin when checking the table box
+        https://bugs.webkit.org/show_bug.cgi?id=214119
+
+        Reviewed by Darin Adler.
+
+        * fast/layoutformattingcontext/table-with-margin-simple-expected.html: Added.
+        * fast/layoutformattingcontext/table-with-margin-simple.html: Added.
+
 2020-07-09  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-09  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Verification] Use the table wrapper box's margin when checking the table box
+        https://bugs.webkit.org/show_bug.cgi?id=214119
+
+        Reviewed by Darin Adler.
+
+        Table margins are propagated to the table wrapper box.
+
+        Test: fast/layoutformattingcontext/table-with-margin-simple.html
+
+        * layout/Verification.cpp:
+        (WebCore::Layout::outputMismatchingBlockBoxInformationIfNeeded):
+        (WebCore::Layout::LayoutContext::verifyAndOutputMismatchingLayoutTree):
+
 2020-07-09  Alicia Boya García  <aboya@igalia.com>
 

trunk/Source/WebCore/layout/Verification.cpp

@@ -234 +234 @@
     };
 
-    auto renderBoxLikeMarginBox = [&] (auto& displayBox) {
+    auto renderBoxLikeMarginBox = [&] (const auto& displayBox) {
         if (layoutBox.isInitialContainingBlock())
             return displayBox.rect();
@@ -278 +278 @@
         auto& tableWrapperDisplayBox = layoutState.displayBoxForLayoutBox(layoutBox.containingBlock());
         displayBox.moveBy(tableWrapperDisplayBox.topLeft());
+        // Table wrapper box has the margin values for the table.
+        displayBox.setHorizontalMargin(tableWrapperDisplayBox.horizontalMargin());
+        displayBox.setVerticalMargin(tableWrapperDisplayBox.verticalMargin());
     }