Changeset 145758 in webkit

Timestamp:

Mar 13, 2013 2:50:11 PM (11 years ago)

Author:

jchaffraix@webkit.org

Message:

[CSS Grid Layout] Handle min-width / max-width on the grid element
​https://bugs.webkit.org/show_bug.cgi?id=112269

Reviewed by Ojan Vafai.

Source/WebCore:

Test: fast/css-grid-layout/grid-element-min-max-width.html

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::GridIterator::GridIterator):
Added some sanity checks that the starting indexes are in the grid.

(WebCore::RenderGrid::computeIntrinsicLogicalWidths):
Updated the code to use m_grid to iterate: this is the correct way to
go as it will handle implicit rows / columns properly. Added a comment
about the current way being inefficient and incorrect with spanning grid
items.

(WebCore::RenderGrid::computePreferredLogicalWidths):
Updated the comments.

(WebCore::RenderGrid::gridTrackSize):

• rendering/RenderGrid.h:

Constified gridTrackSize.

LayoutTests:

• fast/css-grid-layout/grid-element-min-max-width-expected.txt: Added.
• fast/css-grid-layout/grid-element-min-max-width.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-element-min-max-width-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-element-min-max-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (4 diffs)
• Source/WebCore/rendering/RenderGrid.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-03-13  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        [CSS Grid Layout] Handle min-width / max-width on the grid element
+        https://bugs.webkit.org/show_bug.cgi?id=112269
+
+        Reviewed by Ojan Vafai.
+
+        * fast/css-grid-layout/grid-element-min-max-width-expected.txt: Added.
+        * fast/css-grid-layout/grid-element-min-max-width.html: Added.
+
 2013-03-13  Tao Bai  <michaelbai@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-13  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        [CSS Grid Layout] Handle min-width / max-width on the grid element
+        https://bugs.webkit.org/show_bug.cgi?id=112269
+
+        Reviewed by Ojan Vafai.
+
+        Test: fast/css-grid-layout/grid-element-min-max-width.html
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::GridIterator::GridIterator):
+        Added some sanity checks that the starting indexes are in the grid.
+
+        (WebCore::RenderGrid::computeIntrinsicLogicalWidths):
+        Updated the code to use m_grid to iterate: this is the correct way to
+        go as it will handle implicit rows / columns properly. Added a comment
+        about the current way being inefficient and incorrect with spanning grid
+        items.
+
+        (WebCore::RenderGrid::computePreferredLogicalWidths):
+        Updated the comments.
+
+        (WebCore::RenderGrid::gridTrackSize):
+        * rendering/RenderGrid.h:
+        Constified gridTrackSize.
+
 2013-03-13  Simon Hausmann  <simon.hausmann@digia.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -79 +79 @@
         , m_childIndex(0)
     {
+        ASSERT(m_rowIndex < m_grid.size());
+        ASSERT(m_columnIndex < m_grid[0].size());
     }
 
@@ -191 +193 @@
     const_cast<RenderGrid*>(this)->placeItemsOnGrid();
 
-    const Vector<GridTrackSize>& trackStyles = style()->gridColumns();
-    for (size_t i = 0; i < trackStyles.size(); ++i) {
-        LayoutUnit minTrackBreadth = computePreferredTrackWidth(trackStyles[i].minTrackBreadth(), i);
-        LayoutUnit maxTrackBreadth = computePreferredTrackWidth(trackStyles[i].maxTrackBreadth(), i);
+    // FIXME: This is an inefficient way to fill our sizes as it will try every grid areas, when we would
+    // only want to account for fixed grid tracks and grid items. Also this will be incorrect if we have spanning
+    // grid items.
+    for (size_t i = 0; i < gridColumnCount(); ++i) {
+        const GridTrackSize& trackSize = gridTrackSize(ForColumns, i);
+        LayoutUnit minTrackBreadth = computePreferredTrackWidth(trackSize.minTrackBreadth(), i);
+        LayoutUnit maxTrackBreadth = computePreferredTrackWidth(trackSize.maxTrackBreadth(), i);
         maxTrackBreadth = std::max(maxTrackBreadth, minTrackBreadth);
 
@@ -213 +218 @@
     m_maxPreferredLogicalWidth = 0;
 
-    // FIXME: We don't take our own logical width into account.
+    // FIXME: We don't take our own logical width into account. Once we do, we need to make sure
+    // we apply (and test the interaction with) min-width / max-width.
+
     computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
-    // FIXME: We should account for min / max logical width.
 
     LayoutUnit borderAndPaddingInInlineDirection = borderAndPaddingLogicalWidth();
@@ -317 +323 @@
 }
 
-const GridTrackSize& RenderGrid::gridTrackSize(TrackSizingDirection direction, size_t i)
+const GridTrackSize& RenderGrid::gridTrackSize(TrackSizingDirection direction, size_t i) const
 {
     const Vector<GridTrackSize>& trackStyles = (direction == ForColumns) ? style()->gridColumns() : style()->gridRows();

trunk/Source/WebCore/rendering/RenderGrid.h

@@ -108 +108 @@
     void distributeSpaceToTracks(Vector<GridTrack*>&, Vector<GridTrack*>* tracksForGrowthAboveMaxBreadth, AccumulatorGetter, AccumulatorGrowFunction, LayoutUnit& availableLogicalSpace);
 
-    const GridTrackSize& gridTrackSize(TrackSizingDirection, size_t);
+    const GridTrackSize& gridTrackSize(TrackSizingDirection, size_t) const;
     size_t maximumIndexInDirection(TrackSizingDirection) const;