Changeset 222321 in webkit

Timestamp:

Sep 21, 2017 9:28:35 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

In regular block layout, the width of a child's margin box should always be equal to that of its containing block
Merge from Blink ​https://bugs.chromium.org/p/chromium/issues/detail?id=708751
​https://bugs.webkit.org/show_bug.cgi?id=176620

Patch by Zhifei FANG <​facetothefate@gmail.com> on 2017-09-21
Reviewed by Zalan Bujtas.

Source/WebCore:

Test: fast/block/over-constrained-auto-margin.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeLogicalWidthInRegion const):

LayoutTests:

• fast/block/over-constrained-auto-margin-expected.txt: Added.
• fast/block/over-constrained-auto-margin.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/over-constrained-auto-margin-expected.txt (added)
• LayoutTests/fast/block/over-constrained-auto-margin.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-09-21  Zhifei FANG  <facetothefate@gmail.com>
+
+        In regular block layout, the width of a child's margin box should always be equal to that of its containing block
+        Merge from Blink https://bugs.chromium.org/p/chromium/issues/detail?id=708751
+        https://bugs.webkit.org/show_bug.cgi?id=176620
+
+        Reviewed by Zalan Bujtas.
+
+        * fast/block/over-constrained-auto-margin-expected.txt: Added.
+        * fast/block/over-constrained-auto-margin.html: Added.
+
 2017-09-21  Ms2ger  <Ms2ger@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-09-21  Zhifei FANG  <facetothefate@gmail.com>
+
+        In regular block layout, the width of a child's margin box should always be equal to that of its containing block
+        Merge from Blink https://bugs.chromium.org/p/chromium/issues/detail?id=708751
+        https://bugs.webkit.org/show_bug.cgi?id=176620
+
+        Reviewed by Zalan Bujtas.
+
+        Test: fast/block/over-constrained-auto-margin.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeLogicalWidthInRegion const):
+
 2017-09-21  Javier Fernandez  <jfernandez@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2390 +2390 @@
         && !cb.isRenderGrid()
         ) {
-        LayoutUnit newMargin = containerLogicalWidth - computedValues.m_extent - cb.marginStartForChild(*this);
+        LayoutUnit newMarginTotal = containerLogicalWidth - computedValues.m_extent;
         bool hasInvertedDirection = cb.style().isLeftToRightDirection() != style().isLeftToRightDirection();
         if (hasInvertedDirection)
-            computedValues.m_margins.m_start = newMargin;
+            computedValues.m_margins.m_start = newMarginTotal - computedValues.m_margins.m_end;
         else
-            computedValues.m_margins.m_end = newMargin;
+            computedValues.m_margins.m_end = newMarginTotal - computedValues.m_margins.m_start;
     }
 }