Changeset 178895 in webkit

Timestamp:

Jan 22, 2015 12:56:13 AM (9 years ago)

Author:

svillar@igalia.com

Message:

[CSS Grid Layout] Skip items spanning flex tracks when sizing content based tracks
​https://bugs.webkit.org/show_bug.cgi?id=140720

Reviewed by David Hyatt.

Source/WebCore:

Section "11.5. Resolve Intrinsic Track Sizes" of the specs forces
us to ignore items spanning tracks with flex sizing functions when
resolving the content-based track sizing functions. Items with
span < 2 are not affected by this rule (as they will belong to a
single track). This way the algorithm ensures that min-content and
max-content restrictions are fulfilled before distributing the
extra space.

Test: fast/css-grid-layout/flex-and-content-sized-resolution-columns.html

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::spanningItemCrossesFlexibleSizedTracks):
(WebCore::integerSpanForDirection):
(WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):

• rendering/RenderGrid.h:

LayoutTests:

• fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt: Added.
• fast/css-grid-layout/flex-and-content-sized-resolution-columns.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt (added)
• LayoutTests/fast/css-grid-layout/flex-and-content-sized-resolution-columns.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (2 diffs)
• Source/WebCore/rendering/RenderGrid.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-01-21  Sergio Villar Senin  <svillar@igalia.com>
+
+        [CSS Grid Layout] Skip items spanning flex tracks when sizing content based tracks
+        https://bugs.webkit.org/show_bug.cgi?id=140720
+
+        Reviewed by David Hyatt.
+
+        * fast/css-grid-layout/flex-and-content-sized-resolution-columns-expected.txt: Added.
+        * fast/css-grid-layout/flex-and-content-sized-resolution-columns.html: Added.
+
 2015-01-22  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-01-21  Sergio Villar Senin  <svillar@igalia.com>
+
+        [CSS Grid Layout] Skip items spanning flex tracks when sizing content based tracks
+        https://bugs.webkit.org/show_bug.cgi?id=140720
+
+        Reviewed by David Hyatt.
+
+        Section "11.5. Resolve Intrinsic Track Sizes" of the specs forces
+        us to ignore items spanning tracks with flex sizing functions when
+        resolving the content-based track sizing functions. Items with
+        span < 2 are not affected by this rule (as they will belong to a
+        single track). This way the algorithm ensures that min-content and
+        max-content restrictions are fulfilled before distributing the
+        extra space.
+
+        Test: fast/css-grid-layout/flex-and-content-sized-resolution-columns.html
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::spanningItemCrossesFlexibleSizedTracks):
+        (WebCore::integerSpanForDirection):
+        (WebCore::RenderGrid::resolveContentBasedTrackSizingFunctions):
+        * rendering/RenderGrid.h:
+
 2015-01-22  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -560 +560 @@
 };
 
+bool RenderGrid::spanningItemCrossesFlexibleSizedTracks(const GridCoordinate& coordinate, GridTrackSizingDirection direction) const
+{
+    const GridSpan itemSpan = (direction == ForColumns) ? coordinate.columns : coordinate.rows;
+    for (auto trackPosition : itemSpan) {
+        const GridTrackSize& trackSize = gridTrackSize(direction, trackPosition.toInt());
+        if (trackSize.minTrackBreadth().isFlex() || trackSize.maxTrackBreadth().isFlex())
+            return true;
+    }
+
+    return false;
+}
+
+static inline unsigned integerSpanForDirection(const GridCoordinate& coordinate, GridTrackSizingDirection direction)
+{
+    return (direction == ForRows) ? coordinate.rows.integerSpan() : coordinate.columns.integerSpan();
+}
+
 void RenderGrid::resolveContentBasedTrackSizingFunctions(GridTrackSizingDirection direction, GridSizingData& sizingData)
 {
-    // FIXME: Split the grid tracks into groups that doesn't overlap a <flex> grid track.
     sizingData.itemsSortedByIncreasingSpan.shrink(0);
     HashSet<RenderBox*> itemsSet;
@@ -569 +585 @@
 
         while (RenderBox* gridItem = iterator.nextGridItem()) {
-            if (itemsSet.add(gridItem).isNewEntry)
-                sizingData.itemsSortedByIncreasingSpan.append(GridItemWithSpan(*gridItem, cachedGridCoordinate(*gridItem), direction));
+            if (itemsSet.add(gridItem).isNewEntry) {
+                const GridCoordinate& coordinate = cachedGridCoordinate(*gridItem);
+                // We should not include items spanning more than one track that span tracks with flexible sizing functions.
+                if (integerSpanForDirection(coordinate, direction) == 1 || !spanningItemCrossesFlexibleSizedTracks(coordinate, direction))
+                    sizingData.itemsSortedByIncreasingSpan.append(GridItemWithSpan(*gridItem, coordinate, direction));
+            }
         }
     }

trunk/Source/WebCore/rendering/RenderGrid.h

@@ -115 +115 @@
     bool gridWasPopulated() const { return !m_grid.isEmpty() && !m_grid[0].isEmpty(); }
 
+    bool spanningItemCrossesFlexibleSizedTracks(const GridCoordinate&, GridTrackSizingDirection) const;
+
     unsigned gridColumnCount() const
     {