Index: LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
diff --git a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
index 1e72f33edcf99fa9020e9f25c53912c705193513..dbb0f663b1fbbc016dd2fca8ef6995b27abb221a 100644 |
--- a/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
+++ b/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set-expected.txt |
@@ -18,10 +18,10 @@ PASS getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('g |
PASS getComputedStyle(gridWithViewPortPercentageElement, '').getPropertyValue('grid-rows') is '60px' |
PASS getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-columns') is 'minmax(10%, 15px)' |
PASS getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-rows') is 'minmax(20px, 50%)' |
-PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-columns') is '-webkit-min-content' |
-PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-rows') is '-webkit-min-content' |
-PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-columns') is '-webkit-max-content' |
-PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-rows') is '-webkit-max-content' |
+PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-columns') is 'min-content' |
+PASS getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-rows') is 'min-content' |
+PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-columns') is 'max-content' |
+PASS getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-rows') is 'max-content' |
PASS getComputedStyle(gridWithFraction, '').getPropertyValue('grid-columns') is '1fr' |
PASS getComputedStyle(gridWithFraction, '').getPropertyValue('grid-rows') is '2fr' |
@@ -44,24 +44,24 @@ PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'auto' |
PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'auto' |
PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is '80px' |
PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is '150px' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is '-webkit-min-content' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is '-webkit-min-content' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is '-webkit-max-content' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is '-webkit-max-content' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'min-content' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'min-content' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'max-content' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'max-content' |
Test getting and setting grid-columns and grid-rows to minmax() values through JS |
PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(55%, 45px)' |
PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(30px, 40%)' |
PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(220px, 48px)' |
PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(80px, 50px)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(-webkit-min-content, 48px)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(80px, -webkit-min-content)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(220px, -webkit-max-content)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(-webkit-max-content, 50px)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(220px, -webkit-max-content)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(-webkit-max-content, 50px)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(-webkit-min-content, -webkit-max-content)' |
-PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(-webkit-max-content, -webkit-min-content)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(min-content, 48px)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(80px, min-content)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(220px, max-content)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(max-content, 50px)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(220px, max-content)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(max-content, 50px)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is 'minmax(min-content, max-content)' |
+PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is 'minmax(max-content, min-content)' |
PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is '3600fr' |
PASS getComputedStyle(element, '').getPropertyValue('grid-rows') is '154fr' |
PASS getComputedStyle(element, '').getPropertyValue('grid-columns') is '3.1459fr' |