Changeset 189538 in webkit

Timestamp:

Sep 9, 2015 4:23:07 AM (9 years ago)

Author:

Manuel Rego Casasnovas

Message:

[css-grid] Percentage columns shouldn't include border and padding
​https://bugs.webkit.org/show_bug.cgi?id=148978

Reviewed by Sergio Villar Senin.

Source/WebCore:

Subtract border and padding when we're calculating the breadth of the
columns in LayoutGrid::computeUsedBreadthOfSpecifiedLength().

Added test to check the behavior for both columns and rows.

Test: fast/css-grid-layout/grid-percent-track-margin-border-padding.html

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::computeUsedBreadthOfSpecifiedLength):

LayoutTests:

• fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt: Added.
• fast/css-grid-layout/grid-percent-track-margin-border-padding.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-percent-track-margin-border-padding.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-09-09  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Percentage columns shouldn't include border and padding
+        https://bugs.webkit.org/show_bug.cgi?id=148978
+
+        Reviewed by Sergio Villar Senin.
+
+        * fast/css-grid-layout/grid-percent-track-margin-border-padding-expected.txt: Added.
+        * fast/css-grid-layout/grid-percent-track-margin-border-padding.html: Added.
+
 2015-09-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-09-09  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Percentage columns shouldn't include border and padding
+        https://bugs.webkit.org/show_bug.cgi?id=148978
+
+        Reviewed by Sergio Villar Senin.
+
+        Subtract border and padding when we're calculating the breadth of the
+        columns in LayoutGrid::computeUsedBreadthOfSpecifiedLength().
+
+        Added test to check the behavior for both columns and rows.
+
+        Test: fast/css-grid-layout/grid-percent-track-margin-border-padding.html
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::computeUsedBreadthOfSpecifiedLength):
+
 2015-09-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -452 +452 @@
     ASSERT(trackLength.isSpecified());
     if (direction == ForColumns)
-        return valueForLength(trackLength, logicalWidth());
+        return valueForLength(trackLength, logicalWidth() - borderAndPaddingLogicalWidth());
     return valueForLength(trackLength, computeContentLogicalHeight(MainOrPreferredSize, style().logicalHeight(), Nullopt).valueOr(0));
 }