Changeset 207288 in webkit

Timestamp:

Oct 13, 2016 8:25:14 AM (8 years ago)

Author:

svillar@igalia.com

Message:

[css-grid] Fix intrinsic maximums resolution with fit-content and auto
​https://bugs.webkit.org/show_bug.cgi?id=163282

Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

The step 2.5 in section 12.5 ​https://drafts.csswg.org/css-grid/#algo-content of the specs,
details how to sizes tracks with intrinsic max track sizing functions.

Not so long ago there were only two max track sizing functions min-content and max-content
(auto was always resolved to max-content). However there were some recent changes that force
us to consider 2 new values: auto (which is not internally translated to max-content
although it still works the same) and specially the newly added fit-content.

Some of the new test cases are commented due to bug ​http://wkb.ug/163283.

Test: fast/css-grid-layout/grid-intrinsic-maximums.html

• rendering/RenderGrid.cpp:

(WebCore::RenderGrid::shouldProcessTrackForTrackSizeComputationPhase):

• rendering/style/GridTrackSize.h:

(WebCore::GridTrackSize::cacheMinMaxTrackBreadthTypes):
(WebCore::GridTrackSize::hasIntrinsicMinTrackBreadth):
(WebCore::GridTrackSize::hasIntrinsicMaxTrackBreadth):
(WebCore::GridTrackSize::hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth):

LayoutTests:

New test cases to verify that all tracks with intrinsic max track sizing functions are used
in step 2.5 of the track sizing algorith. Some of the new test cases are commented due to
​http://wkb.ug/163283.

• fast/css-grid-layout/grid-intrinsic-maximums-expected.html: Added.
• fast/css-grid-layout/grid-intrinsic-maximums.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums-expected.html (added)
• LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderGrid.cpp (modified) (1 diff)
• Source/WebCore/rendering/style/GridTrackSize.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-11  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-grid] Fix intrinsic maximums resolution with fit-content and auto
+        https://bugs.webkit.org/show_bug.cgi?id=163282
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        New test cases to verify that all tracks with intrinsic max track sizing functions are used
+        in step 2.5 of the track sizing algorith. Some of the new test cases are commented due to
+        http://wkb.ug/163283.
+
+        * fast/css-grid-layout/grid-intrinsic-maximums-expected.html: Added.
+        * fast/css-grid-layout/grid-intrinsic-maximums.html: Added.
+
 2016-10-13  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-11  Sergio Villar Senin  <svillar@igalia.com>
+
+        [css-grid] Fix intrinsic maximums resolution with fit-content and auto
+        https://bugs.webkit.org/show_bug.cgi?id=163282
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        The step 2.5 in section 12.5 https://drafts.csswg.org/css-grid/#algo-content of the specs,
+        details how to sizes tracks with intrinsic max track sizing functions.
+
+        Not so long ago there were only two max track sizing functions min-content and max-content
+        (auto was always resolved to max-content). However there were some recent changes that force
+        us to consider 2 new values: auto (which is not internally translated to max-content
+        although it still works the same) and specially the newly added fit-content.
+
+        Some of the new test cases are commented due to bug http://wkb.ug/163283.
+
+        Test: fast/css-grid-layout/grid-intrinsic-maximums.html
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::shouldProcessTrackForTrackSizeComputationPhase):
+        * rendering/style/GridTrackSize.h:
+        (WebCore::GridTrackSize::cacheMinMaxTrackBreadthTypes):
+        (WebCore::GridTrackSize::hasIntrinsicMinTrackBreadth):
+        (WebCore::GridTrackSize::hasIntrinsicMaxTrackBreadth):
+        (WebCore::GridTrackSize::hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth):
+
 2016-10-13  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebCore/rendering/RenderGrid.cpp

@@ -1213 +1213 @@
         return trackSize.hasMaxContentMinTrackBreadth();
     case ResolveIntrinsicMaximums:
-        return trackSize.hasMinOrMaxContentMaxTrackBreadth();
+        return trackSize.hasIntrinsicMaxTrackBreadth();
     case ResolveMaxContentMaximums:
         return trackSize.hasMaxContentOrAutoMaxTrackBreadth();

trunk/Source/WebCore/rendering/style/GridTrackSize.h

@@ -105 +105 @@
         m_maxTrackBreadthIsMinContent = maxTrackBreadth().isLength() && maxTrackBreadth().length().isMinContent();
         m_maxTrackBreadthIsAuto = maxTrackBreadth().isLength() && maxTrackBreadth().length().isAuto();
+
+        // These values depend on the above ones so keep them here.
+        m_minTrackBreadthIsIntrinsic = m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent
+            || m_minTrackBreadthIsAuto || isFitContent();
+        m_maxTrackBreadthIsIntrinsic = m_maxTrackBreadthIsMaxContent || m_maxTrackBreadthIsMinContent
+            || m_maxTrackBreadthIsAuto || isFitContent();
     }
 
-    bool hasIntrinsicMinTrackBreadth() const { return m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent || m_minTrackBreadthIsAuto; }
+    bool hasIntrinsicMinTrackBreadth() const { return m_minTrackBreadthIsIntrinsic; }
+    bool hasIntrinsicMaxTrackBreadth() const { return m_maxTrackBreadthIsIntrinsic; }
     bool hasMinOrMaxContentMinTrackBreadth() const { return m_minTrackBreadthIsMaxContent || m_minTrackBreadthIsMinContent; }
     bool hasAutoMinTrackBreadth() const { return m_minTrackBreadthIsAuto; }
@@ -118 +125 @@
     bool hasMinContentMinTrackBreadth() const { return m_minTrackBreadthIsMinContent; }
     bool hasMaxContentMinTrackBreadthAndMaxContentMaxTrackBreadth() const { return m_minTrackBreadthIsMaxContent && m_maxTrackBreadthIsMaxContent; }
-    bool hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth() const { return (m_minTrackBreadthIsMinContent || m_minTrackBreadthIsAuto) && (m_maxTrackBreadthIsAuto || hasMinOrMaxContentMaxTrackBreadth()); }
+    bool hasAutoOrMinContentMinTrackBreadthAndIntrinsicMaxTrackBreadth() const { return (m_minTrackBreadthIsMinContent || m_minTrackBreadthIsAuto) && m_maxTrackBreadthIsIntrinsic; }
 
 private:
@@ -132 +139 @@
     bool m_maxTrackBreadthIsMaxContent : 1;
     bool m_maxTrackBreadthIsMinContent : 1;
+    bool m_minTrackBreadthIsIntrinsic : 1;
+    bool m_maxTrackBreadthIsIntrinsic : 1;
 };