Changeset 263846 in webkit

Timestamp:

Jul 2, 2020, 7:52:36 AM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][BFC] Remove redundant margin-border-padding when computing the intrinsic width
​https://bugs.webkit.org/show_bug.cgi?id=213882

Reviewed by Antti Koivisto.

Source/WebCore:

The child intrinsic width already includes the margin-border-padding values.

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

• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::intrinsicWidthConstraints):

LayoutTests:

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

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-07-02  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] Remove redundant margin-border-padding when computing the intrinsic width
+        https://bugs.webkit.org/show_bug.cgi?id=213882
+
+        Reviewed by Antti Koivisto.
+
+        * fast/layoutformattingcontext/table-with-margin-content-simple-expected.html: Added.
+        * fast/layoutformattingcontext/table-with-margin-content-simple.html: Added.
+
 2020-07-02  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-02  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][BFC] Remove redundant margin-border-padding when computing the intrinsic width
+        https://bugs.webkit.org/show_bug.cgi?id=213882
+
+        Reviewed by Antti Koivisto.
+
+        The child intrinsic width already includes the margin-border-padding values.
+
+        Test: fast/layoutformattingcontext/table-with-margin-content-simple.html
+
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::intrinsicWidthConstraints):
+
 2020-07-02  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -379 +379 @@
             ASSERT(childIntrinsicWidthConstraints);
 
-            // FIXME Check for box-sizing: border-box;
-            auto marginBorderAndPadding = fixedMarginBorderAndPadding(child);
-            intrinsicWidthConstraints.minimum = std::max(intrinsicWidthConstraints.minimum, childIntrinsicWidthConstraints->minimum + marginBorderAndPadding);
-            intrinsicWidthConstraints.maximum = std::max(intrinsicWidthConstraints.maximum, childIntrinsicWidthConstraints->maximum + marginBorderAndPadding);
+            intrinsicWidthConstraints.minimum = std::max(intrinsicWidthConstraints.minimum, childIntrinsicWidthConstraints->minimum);
+            intrinsicWidthConstraints.maximum = std::max(intrinsicWidthConstraints.maximum, childIntrinsicWidthConstraints->maximum);
         }
         return intrinsicWidthConstraints;