Changeset 141616 in webkit

Timestamp:

Feb 1, 2013 11:29:18 AM (11 years ago)

Author:

jchaffraix@webkit.org

Message:

[CSS Grid Layout] computePreferredLogicalWidths doesn't handle minmax tracks
​https://bugs.webkit.org/show_bug.cgi?id=108403

Reviewed by Ojan Vafai.

Source/WebCore:

Test: fast/css-grid-layout/grid-preferred-logical-widths.html

The code before this change was only handling minmax() with 2 fixed widths.
The new code was updated to remove this artificial limitation and we now
support all combination of minmax().

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::computePreferredLogicalWidths):
Updated to use computePreferredTrackWidth..

(WebCore::RenderGrid::computePreferredTrackWidth):
Added this helper function that implements the core of the preferred width
computation.

• rendering/RenderGrid.h: Added computePreferredTrackWidth.

LayoutTests:

• fast/css-grid-layout/grid-preferred-logical-widths-expected.txt: Added.
• fast/css-grid-layout/grid-preferred-logical-widths.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths-expected.txt (added)
• LayoutTests/fast/css-grid-layout/grid-preferred-logical-widths.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 @@
+2013-02-01  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        [CSS Grid Layout] computePreferredLogicalWidths doesn't handle minmax tracks
+        https://bugs.webkit.org/show_bug.cgi?id=108403
+
+        Reviewed by Ojan Vafai.
+
+        * fast/css-grid-layout/grid-preferred-logical-widths-expected.txt: Added.
+        * fast/css-grid-layout/grid-preferred-logical-widths.html: Added.
+
 2013-02-01  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-01  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        [CSS Grid Layout] computePreferredLogicalWidths doesn't handle minmax tracks
+        https://bugs.webkit.org/show_bug.cgi?id=108403
+
+        Reviewed by Ojan Vafai.
+
+        Test: fast/css-grid-layout/grid-preferred-logical-widths.html
+
+        The code before this change was only handling minmax() with 2 fixed widths.
+        The new code was updated to remove this artificial limitation and we now
+        support all combination of minmax().
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::computePreferredLogicalWidths):
+        Updated to use computePreferredTrackWidth..
+
+        (WebCore::RenderGrid::computePreferredTrackWidth):
+        Added this helper function that implements the core of the preferred width
+        computation.
+
+        * rendering/RenderGrid.h: Added computePreferredTrackWidth.
+
 2013-02-01  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -143 +143 @@
 
     for (size_t i = 0; i < trackStyles.size(); ++i) {
-        const Length& minTrackLength = trackStyles[i].minTrackBreadth();
-        const Length& maxTrackLength = trackStyles[i].maxTrackBreadth();
-        // FIXME: Handle only one fixed length properly (e.g minmax(100px, max-content)).
-        if (!minTrackLength.isFixed() || !maxTrackLength.isFixed()) {
-            notImplemented();
-            continue;
-        }
-
-        LayoutUnit minTrackBreadth = minTrackLength.intValue();
-        LayoutUnit maxTrackBreadth = maxTrackLength.intValue();
-
+        LayoutUnit minTrackBreadth = computePreferredTrackWidth(trackStyles[i].minTrackBreadth(), i);
+        LayoutUnit maxTrackBreadth = computePreferredTrackWidth(trackStyles[i].maxTrackBreadth(), i);
         maxTrackBreadth = std::max(maxTrackBreadth, minTrackBreadth);
 
@@ -169 +160 @@
 
     setPreferredLogicalWidthsDirty(false);
+}
+
+LayoutUnit RenderGrid::computePreferredTrackWidth(const Length& length, size_t trackIndex) const
+{
+    if (length.isFixed()) {
+        // Grid areas don't have borders, margins or paddings so we don't need to account for them.
+        return length.intValue();
+    }
+
+    if (length.isMinContent()) {
+        LayoutUnit minContentSize = 0;
+        // FIXME: It's inefficient to iterate over our grid items. We should be able to
+        // get the subset of grid items in the current row / column faster.
+        for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+            size_t cellIndex = resolveGridPosition(ForColumns, child);
+            if (cellIndex != trackIndex)
+                continue;
+
+            // FIXME: We should include the child's fixed margins like RenderFlexibleBox.
+            minContentSize = std::max(minContentSize, child->minPreferredLogicalWidth());
+        }
+        return minContentSize;
+    }
+
+    if (length.isMaxContent()) {
+        LayoutUnit maxContentSize = 0;
+        for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox()) {
+            size_t cellIndex = resolveGridPosition(ForColumns, child);
+            if (cellIndex != trackIndex)
+                continue;
+
+            // FIXME: We should include the child's fixed margins like RenderFlexibleBox.
+            maxContentSize = std::max(maxContentSize, child->maxPreferredLogicalWidth());
+        }
+        return maxContentSize;
+    }
+
+    // FIXME: css3-sizing mentions that we should resolve "definite sizes"
+    // (including <percentage> and calc()) but we don't do it elsewhere.
+    return 0;
 }
 

trunk/Source/WebCore/rendering/RenderGrid.h

@@ -49 +49 @@
     virtual void computePreferredLogicalWidths() OVERRIDE;
 
+    LayoutUnit computePreferredTrackWidth(const Length&, size_t) const;
+
     enum TrackSizingDirection { ForColumns, ForRows };
     void computedUsedBreadthOfGridTracks(TrackSizingDirection, Vector<GridTrack>& columnTracks, Vector<GridTrack>& rowTracks);