Title: [207290] trunk
Revision
207290
Author
svil...@igalia.com
Date
2016-10-13 10:02:53 -0700 (Thu, 13 Oct 2016)

Log Message

[css-grid] Use min-size instead of min-content contribution for intrinsic maximums resolution
https://bugs.webkit.org/show_bug.cgi?id=163283

Reviewed by Manuel Rego Casasnovas.

Source/WebCore:

This was recently modified in the specs
https://hg.csswg.org/drafts/diff/575fb847e29d/css-grid/Overview.bs. Specifically this is
addressing the last one. It used to be "min-content contribution" but now it says "min-size
contribution".

* rendering/RenderGrid.cpp:
(WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):

LayoutTests:

Uncommented a bunch of failing test cases that are working fine now.

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

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (207289 => 207290)


--- trunk/LayoutTests/ChangeLog	2016-10-13 15:36:00 UTC (rev 207289)
+++ trunk/LayoutTests/ChangeLog	2016-10-13 17:02:53 UTC (rev 207290)
@@ -1,3 +1,15 @@
+2016-10-13  Sergio Villar Senin  <svil...@igalia.com>
+
+        [css-grid] Use min-size instead of min-content contribution for intrinsic maximums resolution
+        https://bugs.webkit.org/show_bug.cgi?id=163283
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        Uncommented a bunch of failing test cases that are working fine now.
+
+        * fast/css-grid-layout/grid-intrinsic-maximums-expected.html:
+        * fast/css-grid-layout/grid-intrinsic-maximums.html:
+
 2016-10-11  Sergio Villar Senin  <svil...@igalia.com>
 
         [css-grid] Fix intrinsic maximums resolution with fit-content and auto

Modified: trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums-expected.html (207289 => 207290)


--- trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums-expected.html	2016-10-13 15:36:00 UTC (rev 207289)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums-expected.html	2016-10-13 17:02:53 UTC (rev 207290)
@@ -40,14 +40,11 @@
 
 <div class="float">
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid" style="grid-template: 20px / 10px 5px;">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
     <div class="abs col1"></div>
     <div class="abs col2"></div>
 </div>
--->
 
 <div class="grid" style="grid-template: 20px / 50px 5px;">
     <div class="item" style="min-width: 55px;">XXXX XXXX</div>
@@ -55,14 +52,11 @@
     <div class="abs col2"></div>
 </div>
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid" style="grid-template: 20px / 85px 5px;">
     <div class="item min-width-max-content">XXXX XXXX</div>
     <div class="abs col1"></div>
     <div class="abs col2"></div>
 </div>
--->
 
 <div class="grid" style="grid-template: 20px / 5px 85px;">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
@@ -86,8 +80,6 @@
 
 <div class="float">
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid" style="grid-template: 20px / repeat(2, 5px) 80px;">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -94,7 +86,6 @@
     <div class="abs col2"></div>
     <div class="abs col3"></div>
 </div>
--->
 
 <div class="grid" style="grid-template: 20px / 25px 5px 60px;">
     <div class="item" style="min-width: 55px;">XXXX XXXX</div>
@@ -103,8 +94,6 @@
     <div class="abs col3"></div>
 </div>
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid" style="grid-template: 20px / calc(85px / 2) 5px calc(85px / 2);">
     <div class="item min-width-max-content">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -111,10 +100,7 @@
     <div class="abs col2"></div>
     <div class="abs col3"></div>
 </div>
--->
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid" style="grid-template: 20px / 90px repeat(2, 5px);">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -121,7 +107,6 @@
     <div class="abs col2"></div>
     <div class="abs col3"></div>
 </div>
--->
 
 <div class="grid" style="grid-template: 20px / 70px 5px 25px;">
     <div class="item" style="min-width: 55px;">XXXX XXXX</div>
@@ -130,8 +115,6 @@
     <div class="abs col3"></div>
 </div>
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid" style="grid-template: 20px / calc(105px/2) 5px calc(85px/2);">
     <div class="item min-width-max-content">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -138,7 +121,6 @@
     <div class="abs col2"></div>
     <div class="abs col3"></div>
 </div>
--->
 
 </div>
 

Modified: trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html (207289 => 207290)


--- trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html	2016-10-13 15:36:00 UTC (rev 207289)
+++ trunk/LayoutTests/fast/css-grid-layout/grid-intrinsic-maximums.html	2016-10-13 17:02:53 UTC (rev 207290)
@@ -47,14 +47,11 @@
 
 <div class="float">
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid gridMinContent">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
     <div class="abs col1"></div>
     <div class="abs col2"></div>
 </div>
--->
 
 <div class="grid gridMinContent">
     <div class="item" style="min-width: 55px;">XXXX XXXX</div>
@@ -62,14 +59,11 @@
     <div class="abs col2"></div>
 </div>
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid gridMinContent">
     <div class="item min-width-max-content">XXXX XXXX</div>
     <div class="abs col1"></div>
     <div class="abs col2"></div>
 </div>
--->
 
 <div class="grid gridMaxContent">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
@@ -93,8 +87,6 @@
 
 <div class="float">
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid gridMinMaxContent">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -101,7 +93,6 @@
     <div class="abs col2"></div>
     <div class="abs col3"></div>
 </div>
--->
 
 <div class="grid gridMinMaxContent">
     <div class="item" style="min-width: 55px;">XXXX XXXX</div>
@@ -110,8 +101,6 @@
     <div class="abs col3"></div>
 </div>
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid gridMinMaxContent">
     <div class="item min-width-max-content">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -119,8 +108,6 @@
     <div class="abs col3"></div>
 </div>
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid gridAutoMinContent">
     <div class="item" style="min-width: 15px;">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -127,7 +114,6 @@
     <div class="abs col2"></div>
     <div class="abs col3"></div>
 </div>
--->
 
 <div class="grid gridAutoMinContent">
     <div class="item" style="min-width: 55px;">XXXX XXXX</div>
@@ -136,8 +122,6 @@
     <div class="abs col3"></div>
 </div>
 
-<!-- Fails due to http://wkb.ug/163283 -->
-<!--
 <div class="grid gridAutoMinContent">
     <div class="item min-width-max-content">XXXX XXXX</div>
     <div class="abs col1"></div>
@@ -144,7 +128,6 @@
     <div class="abs col2"></div>
     <div class="abs col3"></div>
 </div>
--->
 
 </div>
 

Modified: trunk/Source/WebCore/ChangeLog (207289 => 207290)


--- trunk/Source/WebCore/ChangeLog	2016-10-13 15:36:00 UTC (rev 207289)
+++ trunk/Source/WebCore/ChangeLog	2016-10-13 17:02:53 UTC (rev 207290)
@@ -1,3 +1,18 @@
+2016-10-13  Sergio Villar Senin  <svil...@igalia.com>
+
+        [css-grid] Use min-size instead of min-content contribution for intrinsic maximums resolution
+        https://bugs.webkit.org/show_bug.cgi?id=163283
+
+        Reviewed by Manuel Rego Casasnovas.
+
+        This was recently modified in the specs
+        https://hg.csswg.org/drafts/diff/575fb847e29d/css-grid/Overview.bs. Specifically this is
+        addressing the last one. It used to be "min-content contribution" but now it says "min-size
+        contribution".
+
+        * rendering/RenderGrid.cpp:
+        (WebCore::RenderGrid::currentItemSizeForTrackSizeComputationPhase):
+
 2016-10-11  Sergio Villar Senin  <svil...@igalia.com>
 
         [css-grid] Fix intrinsic maximums resolution with fit-content and auto

Modified: trunk/Source/WebCore/rendering/RenderGrid.cpp (207289 => 207290)


--- trunk/Source/WebCore/rendering/RenderGrid.cpp	2016-10-13 15:36:00 UTC (rev 207289)
+++ trunk/Source/WebCore/rendering/RenderGrid.cpp	2016-10-13 17:02:53 UTC (rev 207290)
@@ -1291,9 +1291,9 @@
 {
     switch (phase) {
     case ResolveIntrinsicMinimums:
+    case ResolveIntrinsicMaximums:
         return minSizeForChild(gridItem, direction, sizingData);
     case ResolveContentBasedMinimums:
-    case ResolveIntrinsicMaximums:
         return minContentForChild(gridItem, direction, sizingData);
     case ResolveMaxContentMinimums:
     case ResolveMaxContentMaximums:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to