Changeset 199223 in webkit

Timestamp:

Apr 8, 2016 1:52:17 AM (8 years ago)

Author:

Manuel Rego Casasnovas

Message:

[css-grid] Fix positioned items with grid gaps
​https://bugs.webkit.org/show_bug.cgi?id=156288

Reviewed by Darin Adler.

Source/WebCore:

When we place a positioned items in a grid with gaps,
we were not taking into accounts the gutter size.
We've to use that size to properly place and size the item.

Tests: fast/css-grid-layout/grid-positioned-items-gaps-rtl.html

fast/css-grid-layout/grid-positioned-items-gaps.html

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::offsetAndBreadthForPositionedChild):

LayoutTests:

Added new tests checking the right behavior.

• fast/css-grid-layout/grid-positioned-items-gaps-expected.txt: Added.
• fast/css-grid-layout/grid-positioned-items-gaps-rtl-expected.txt: Added.
• fast/css-grid-layout/grid-positioned-items-gaps-rtl.html: Added.
• fast/css-grid-layout/grid-positioned-items-gaps.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps-rtl.html (added)
• LayoutTests/fast/css-grid-layout/grid-positioned-items-gaps.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-08  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Fix positioned items with grid gaps
+        https://bugs.webkit.org/show_bug.cgi?id=156288
+
+        Reviewed by Darin Adler.
+
+        Added new tests checking the right behavior.
+
+        * fast/css-grid-layout/grid-positioned-items-gaps-expected.txt: Added.
+        * fast/css-grid-layout/grid-positioned-items-gaps-rtl-expected.txt: Added.
+        * fast/css-grid-layout/grid-positioned-items-gaps-rtl.html: Added.
+        * fast/css-grid-layout/grid-positioned-items-gaps.html: Added.
+
 2016-04-08  John Wilander  <wilander@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-08  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Fix positioned items with grid gaps
+        https://bugs.webkit.org/show_bug.cgi?id=156288
+
+        Reviewed by Darin Adler.
+
+        When we place a positioned items in a grid with gaps,
+        we were not taking into accounts the gutter size.
+        We've to use that size to properly place and size the item.
+
+        Tests: fast/css-grid-layout/grid-positioned-items-gaps-rtl.html
+               fast/css-grid-layout/grid-positioned-items-gaps.html
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::offsetAndBreadthForPositionedChild):
+
 2016-04-08  Javier Fernandez  <jfernandez@igalia.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -1533 +1533 @@
         else
             end = m_rowPositions[endLine] - m_rowPositions[0] + paddingBefore();
+
+        // These vectors store line positions including gaps, but we shouldn't consider them for the edges of the grid.
+        if (endLine > firstExplicitLine && endLine < lastExplicitLine)
+            end -= guttersSize(direction, 2);
     }
 
@@ -1547 +1551 @@
             LayoutUnit offsetFromLastLine = m_columnPositions[m_columnPositions.size() - 1] - m_columnPositions[endLine];
             offset = paddingLeft() +  alignmentOffset + offsetFromLastLine;
+
+            if (endLine > firstExplicitLine && endLine < lastExplicitLine)
+                offset += guttersSize(direction, 2);
         }
     }