From 568ac2145e423c5f14471af5b591f4b7e1c55453 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 16 Oct 2017 09:56:12 +0000
Subject: [PATCH] Merge r221910 - [css-grid] Use transferred size over content
 size for automatic minimum size
 https://bugs.webkit.org/show_bug.cgi?id=176688

Reviewed by Sergio Villar Senin.

LayoutTests/imported/w3c:

Import changes on the tests related to the new behavior.

* web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-006.html:
* web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-007.html:
* web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-008.html:
* web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-009.html:
* web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-021.html:
* web-platform-tests/css/css-grid-1/grid-items/support/100x50-green.png: Removed.
* web-platform-tests/css/css-grid-1/grid-items/support/25x50-green.png: Added.
* web-platform-tests/css/css-grid-1/grid-items/support/50x100-green.png: Removed.
* web-platform-tests/css/css-grid-1/grid-items/support/50x25-green.png: Added.
* web-platform-tests/css/css-grid-1/grid-items/support/w3c-import.log:

Source/WebCore:

CSS WG has agreed to modify the spec so now the transferred size is used
(if it exists) independently if it's bigger or smaller
than the content size.
See: https://github.com/w3c/csswg-drafts/issues/1149

The spec text (https://drafts.csswg.org/css-grid/#min-size-auto):
  "The automatic minimum size for a grid item in a given dimension is
   its specified size if it exists, otherwise its transferred size
   if that exists, else its content size"

This patch use the WPT tests updated to check the new behavior.

* rendering/GridTrackSizingAlgorithm.cpp:
(WebCore::GridTrackSizingAlgorithmStrategy::minSizeForChild const):
Modified so it always returns the transferred size (if any).
---
 LayoutTests/imported/w3c/ChangeLog            |  20 +++++++++++++++
 .../grid-minimum-size-grid-items-006.html     |   2 +-
 .../grid-minimum-size-grid-items-007.html     |  10 +++++---
 .../grid-minimum-size-grid-items-008.html     |   2 +-
 .../grid-minimum-size-grid-items-009.html     |   9 ++++---
 .../grid-minimum-size-grid-items-021.html     |   8 +++---
 .../grid-items/support/100x50-green.png       | Bin 15130 -> 0 bytes
 .../grid-items/support/25x50-green.png        | Bin 0 -> 99 bytes
 .../grid-items/support/50x100-green.png       | Bin 15180 -> 0 bytes
 .../grid-items/support/50x25-green.png        | Bin 0 -> 100 bytes
 .../grid-items/support/w3c-import.log         |   4 +--
 Source/WebCore/ChangeLog                      |  23 ++++++++++++++++++
 .../rendering/GridTrackSizingAlgorithm.cpp    |   9 +------
 13 files changed, 63 insertions(+), 24 deletions(-)
 delete mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/100x50-green.png
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/25x50-green.png
 delete mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x100-green.png
 create mode 100644 LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x25-green.png

diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index 12b9e7c76108..32da683ce18c 100644
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,23 @@
+2017-09-12  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Use transferred size over content size for automatic minimum size
+        https://bugs.webkit.org/show_bug.cgi?id=176688
+
+        Reviewed by Sergio Villar Senin.
+
+        Import changes on the tests related to the new behavior.
+
+        * web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-006.html:
+        * web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-007.html:
+        * web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-008.html:
+        * web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-009.html:
+        * web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-021.html:
+        * web-platform-tests/css/css-grid-1/grid-items/support/100x50-green.png: Removed.
+        * web-platform-tests/css/css-grid-1/grid-items/support/25x50-green.png: Added.
+        * web-platform-tests/css/css-grid-1/grid-items/support/50x100-green.png: Removed.
+        * web-platform-tests/css/css-grid-1/grid-items/support/50x25-green.png: Added.
+        * web-platform-tests/css/css-grid-1/grid-items/support/w3c-import.log:
+
 2017-09-06  Manuel Rego Casasnovas  <rego@igalia.com>
 
         [css-grid] grid shorthand should not reset the gutter properties
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-006.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-006.html
index 1f0086eac765..69bbc7c09810 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-006.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-006.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.6. Implied Minimum Size of Grid Items">
 <link rel="match" href="ref-filled-green-100px-square-image.html">
 <meta name="flags" content="image">
-<meta name="assert" content="Checks that minimum size for grid items is the specified size for width (regardless the content size) and the transferred size for height (as it's smaller than the content size of the image).">
+<meta name="assert" content="Checks that minimum size for grid items is the specified size for width (regardless the content size) and the transferred size of the image for height (even when content size is bigger).">
 <style>
   #reference-overlapped-red {
     position: absolute;
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-007.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-007.html
index 6f13d8b0835b..8899ca1c7ae1 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-007.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-007.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.6. Implied Minimum Size of Grid Items">
 <link rel="match" href="ref-filled-green-100px-square-image.html">
 <meta name="flags" content="image">
-<meta name="assert" content="Checks that minimum size for grid items is the specified size for width (regardless the content size) and the content size for height (as it's smaller than the transferred size of the image).">
+<meta name="assert" content="Checks that minimum size for grid items is the specified size for width (regardless the content size) and the transferred size of the image for height (even when content size is smaller).">
 <style>
   #reference-overlapped-red {
     position: absolute;
@@ -17,12 +17,13 @@
 
   #constrained-grid {
     display: grid;
+    grid-template-columns: auto auto;
     width: 10px;
     height: 10px;
   }
 
-  #test-grid-item-overlapping-green {
-    width: 100px;
+  .test-grid-item-overlapping-green {
+    width: 50px;
     justify-self: stretch;
     align-self: stretch;
   }
@@ -31,6 +32,7 @@
 
 <div id="reference-overlapped-red"></div>
 <div id="constrained-grid">
-  <img id="test-grid-item-overlapping-green" src="support/50x100-green.png" alt="Image download support must be enabled" />
+  <img class="test-grid-item-overlapping-green" src="support/25x50-green.png" alt="Image download support must be enabled" />
+  <img class="test-grid-item-overlapping-green" src="support/25x50-green.png" alt="Image download support must be enabled" />
 </div>
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-008.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-008.html
index b69070c4c164..c945490c480e 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-008.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-008.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.6. Implied Minimum Size of Grid Items">
 <link rel="match" href="ref-filled-green-100px-square-image.html">
 <meta name="flags" content="image">
-<meta name="assert" content="Checks that minimum size for grid items is the specified size for height (regardless the content size) and the transferred size for width (as it's smaller than the content size of the image).">
+<meta name="assert" content="Checks that minimum size for grid items is the specified size for height (regardless the content size) and the transferred size of the image for width (even when content size is bigger).">
 <style>
   #reference-overlapped-red {
     position: absolute;
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-009.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-009.html
index e0239cf37a58..77d8979cbdde 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-009.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-009.html
@@ -5,7 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-grid-1/#min-size-auto" title="6.6. Implied Minimum Size of Grid Items">
 <link rel="match" href="ref-filled-green-100px-square-image.html">
 <meta name="flags" content="image">
-<meta name="assert" content="Checks that minimum size for grid items is the specified size for height (regardless the content size) and the content size for width (as it's smaller than the transferred size of the image).">
+<meta name="assert" content="Checks that minimum size for grid items is the specified size for height (regardless the content size) and the transferred size for width of the image (even when content size is smaller).">
 <style>
   #reference-overlapped-red {
     position: absolute;
@@ -21,8 +21,8 @@
     height: 10px;
   }
 
-  #test-grid-item-overlapping-green {
-    height: 100px;
+  .test-grid-item-overlapping-green {
+    height: 50px;
     justify-self: stretch;
     align-self: stretch;
   }
@@ -31,6 +31,7 @@
 
 <div id="reference-overlapped-red"></div>
 <div id="constrained-grid">
-  <img id="test-grid-item-overlapping-green" src="support/100x50-green.png" alt="Image download support must be enabled" />
+  <img class="test-grid-item-overlapping-green" src="support/50x25-green.png" alt="Image download support must be enabled" />
+  <img class="test-grid-item-overlapping-green" src="support/50x25-green.png" alt="Image download support must be enabled" />
 </div>
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-021.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-021.html
index 8e02bd43d432..6d7263d35155 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-021.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/grid-minimum-size-grid-items-021.html
@@ -67,17 +67,17 @@
 
   function runTests() {
     checkGridSizeTracksAndImageSize("grid-1", "img-1", "200px", "200px", "200px", "200px", "200px", "200px");
-    checkGridSizeTracksAndImageSize("grid-2", "img-2", "10px", "10px", "200px", "50px", "200px", "200px");
+    checkGridSizeTracksAndImageSize("grid-2", "img-2", "10px", "10px", "200px", "200px", "200px", "200px");
     checkGridSizeTracksAndImageSize("grid-3", "img-3", "200px", "50px", "200px", "50px", "200px", "200px");
     checkGridSizeTracksAndImageSize("grid-4", "img-4", "200px", "10px", "200px", "50px", "200px", "200px");
     checkGridSizeTracksAndImageSize("grid-5", "img-5", "200px", "50px", "50px", "50px", "50px", "50px");
     checkGridSizeTracksAndImageSize("grid-6", "img-6", "200px", "10px", "50px", "50px", "50px", "50px");
     checkGridSizeTracksAndImageSize("grid-7", "img-7", "200px", "225px", "200px", "200px 25px", "200px", "200px");
-    checkGridSizeTracksAndImageSize("grid-8", "img-8", "10px", "10px", "200px", "50px 25px", "200px", "200px");
+    checkGridSizeTracksAndImageSize("grid-8", "img-8", "10px", "10px", "200px", "200px 25px", "200px", "200px");
     checkGridSizeTracksAndImageSize("grid-9", "img-9", "200px", "125px", "200px", "100px 25px", "200px", "200px");
-    checkGridSizeTracksAndImageSize("grid-10", "img-10", "200px", "10px", "200px", "50px 25px", "200px", "200px");
+    checkGridSizeTracksAndImageSize("grid-10", "img-10", "200px", "10px", "200px", "100px 25px", "200px", "200px");
     checkGridSizeTracksAndImageSize("grid-11", "img-11", "200px", "125px", "100px", "100px 25px", "100px", "100px");
-    checkGridSizeTracksAndImageSize("grid-12", "img-12", "200px", "10px", "100px", "50px 25px", "100px", "100px");
+    checkGridSizeTracksAndImageSize("grid-12", "img-12", "200px", "10px", "100px", "100px 25px", "100px", "100px");
     checkGridSizeTracksAndImageSize("grid-13", "img-13", "200px", "200px", "200px", "200px", "200px", "200px");
     checkGridSizeTracksAndImageSize("grid-14", "img-14", "10px", "10px", "200px", "200px", "200px", "200px");
     checkGridSizeTracksAndImageSize("grid-15", "img-15", "200px", "200px", "200px", "200px", "200px", "200px");
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/100x50-green.png b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/100x50-green.png
deleted file mode 100644
index 67f3eaa646c0cc742195e8f144e2e6cfa1c43fdd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15130
zcmeI&u?hhJ9LMoLrKD^oNfs}lEH*lEizH<=7(9eQHV<M@@)j1m-C(hM0C#V2U!%TP
zcQ@Skl25<!j`P{1UTfAOqMlBZMRwn0XRlh$uHDu99npz287{Y#(tXgsm13Vg@F*mZ
z8+sHJ5UU_mo{1$E5CEym5(@}`)MbeU1VHMt!~y~!by;Eo0g$>Zv48+bU6xot0HiKU
zEFb_<mn9Yu0IACo3kZPJWr+m@K<cu@0s<iYeObF_`x4Q7<lh2-AN-f}cesBM0RKZQ
zv48+bU6xot0HiKUEFb_<mn9Yu0IACo3kZPJWr+m@K<cu@0s<g)Sz-YJkh(0ffB;Bc
cmRLXlq%I3!wNCN++#2Wnm2^ByuA}wg3;SOcp#T5?

diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/25x50-green.png b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/25x50-green.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ab02fce0fa9b708880d4dbb2dc2b927fd30f59b
GIT binary patch
literal 99
zcmeAS@N?(olHy`uVBq!ia0vp^l0a<4!2~4L9y~t?q_jL;978;gzdd6p$iTqCvf%m?
wx9u&@Sr}LNtSfm`v@=F;`st@2>iX-g3G*19Z2kH*9jJ@J)78&qol`;+08hdq1poj5

literal 0
HcmV?d00001

diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x100-green.png b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x100-green.png
deleted file mode 100644
index c10c9a7f4dab45e1de9856f376708dbfa51e98e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15180
zcmeI&F%H2197gefi4Y-n7H2TpNQFisA`W0MID%1Z?2ce$b^)hw1GCYfJ;F;2BCkmq
zyh!`&H})`}jhpp$JtCUfBwgg+z5HC)O8MvX_-aISBTEO%O(l8v%l9O9`42yL6j%F$
zhnGbjidt$B0n)lHwTJ*|-IiKJfV6H)Eh0c#x1|;lAg$X{iwKa`ZK*{BNb9!LA_Am!
zTWS#j(z-3RhyZEbmRdxBv~Ei+B0yTV^+m16`ErZsREu{3$lrdm^??#iwbUX4q;*?r
z5dqS=EwzXMY2B7uM1ZtzOD!TmTDPSZ5g@JGQi}+X)@`Xp1W4<))FJ|;bz5o?0n)my
XKhU~wlgakfdKR~mjb`a}xY~aJ;>;B9

diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x25-green.png b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x25-green.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bd68e74214dc709d78883a5c54c71db5e92861b
GIT binary patch
literal 100
zcmeAS@N?(olHy`uVBq!ia0vp^MnEjd!2~4#n7tAPQrey_jv*e$-<~sMWMJT6UXWR|
o`1j0%%t8S(ZLV}qLk8C(@5M1}Dx4eO0My3d>FVdQ&MBb@04Ka43jhEB

literal 0
HcmV?d00001

diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/w3c-import.log
index 4b1efeb572e6..0beb857189ba 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/w3c-import.log
+++ b/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/w3c-import.log
@@ -15,8 +15,8 @@ None
 ------------------------------------------------------------------------
 List of files:
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/100x100-green.png
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/100x50-green.png
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/200x200-green.png
+/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/25x50-green.png
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/500x500-green.png
-/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x100-green.png
+/LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x25-green.png
 /LayoutTests/imported/w3c/web-platform-tests/css/css-grid-1/grid-items/support/50x50-green.png
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 6477f5017952..cefa48e2014c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2017-09-12  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        [css-grid] Use transferred size over content size for automatic minimum size
+        https://bugs.webkit.org/show_bug.cgi?id=176688
+
+        Reviewed by Sergio Villar Senin.
+
+        CSS WG has agreed to modify the spec so now the transferred size is used
+        (if it exists) independently if it's bigger or smaller
+        than the content size.
+        See: https://github.com/w3c/csswg-drafts/issues/1149
+
+        The spec text (https://drafts.csswg.org/css-grid/#min-size-auto):
+          "The automatic minimum size for a grid item in a given dimension is
+           its specified size if it exists, otherwise its transferred size
+           if that exists, else its content size"
+
+        This patch use the WPT tests updated to check the new behavior.
+
+        * rendering/GridTrackSizingAlgorithm.cpp:
+        (WebCore::GridTrackSizingAlgorithmStrategy::minSizeForChild const):
+        Modified so it always returns the transferred size (if any).
+
 2017-09-11  Joanmarie Diggs  <jdiggs@igalia.com>
 
         AX: [ATK] aria-autocomplete not exposed on comboboxes
diff --git a/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp b/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
index 25afaa8037a3..ded6b1b8383c 100644
--- a/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
+++ b/Source/WebCore/rendering/GridTrackSizingAlgorithm.cpp
@@ -786,15 +786,8 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::minSizeForChild(RenderBox& child) c
     const Length& childSize = isRowAxis ? child.style().logicalWidth() : child.style().logicalHeight();
 
     bool overflowIsVisible = isRowAxis ? child.style().overflowInlineDirection() == OVISIBLE : child.style().overflowBlockDirection() == OVISIBLE;
-    if (!childSize.isAuto() || (childMinSize.isAuto() && overflowIsVisible)) {
-        if (child.isRenderReplaced() && childSize.isAuto()) {
-            // If the box has an aspect ratio and no specified size, its automatic
-            // minimum size is the smaller of its content size and its transferred
-            // size.
-            return isRowAxis ? std::min(child.intrinsicLogicalWidth(), minContentForChild(child)) : std::min(child.intrinsicLogicalHeight(), minContentForChild(child));
-        }
+    if (!childSize.isAuto() || (childMinSize.isAuto() && overflowIsVisible))
         return minContentForChild(child);
-    }
 
     bool overrideSizeHasChanged = updateOverrideContainingBlockContentSizeForChild(child, childInlineDirection);