Index: third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
diff --git a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
index 89808556c8b6ece4272aa39b36e4b39066141bd0..7c9aecd627ee1dbd42757407fbc89c347abecc36 100644 |
--- a/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
+++ b/third_party/WebKit/LayoutTests/fast/css-grid-layout/grid-columns-rows-get-set.html |
@@ -1,9 +1,10 @@ |
<!DOCTYPE html> |
<html> |
<head> |
+<link href="../css-intrinsic-dimensions/resources/width-keyword-classes.css" rel="stylesheet"> |
<link href="resources/grid.css" rel="stylesheet"> |
<style> |
-.grid { |
+.definite { |
/* Give an explicit size to the grid so that percentage grid tracks have a consistent resolution */ |
width: 800px; |
height: 600px; |
@@ -93,39 +94,39 @@ |
<script src="../../resources/js-test.js"></script> |
</head> |
<body> |
-<div class="grid gridWithNone" id="gridWithNoneElement"></div> |
-<div class="grid gridWithFixed" id="gridWithFixedElement"></div> |
-<div class="grid gridWithPercent" id="gridWithPercentElement"></div> |
-<div class="indefiniteSizeGrid gridWithPercent" id="gridWithPercentWithoutSize"></div> |
-<div class="indefiniteSizeGrid gridWithPercent" id="gridWithPercentWithoutSizeWithChildren"> |
+<div class="grid definite gridWithNone" id="gridWithNoneElement"></div> |
+<div class="grid definite gridWithFixed" id="gridWithFixedElement"></div> |
+<div class="grid definite gridWithPercent" id="gridWithPercentElement"></div> |
+<div class="grid min-content gridWithPercent" id="gridWithPercentWithoutSize"></div> |
+<div class="grid min-content gridWithPercent" id="gridWithPercentWithoutSizeWithChildren"> |
<div class="gridItem"></div> |
</div> |
-<div class="grid gridWithAuto" id="gridWithAutoElement"></div> |
-<div class="grid gridWithAuto" id="gridWithAutoWithoutSizeElement"></div> |
-<div class="grid gridWithAuto fontSpec" id="gridWithAutoWithChildrenElement"> |
+<div class="grid definite gridWithAuto" id="gridWithAutoElement"></div> |
+<div class="grid definite gridWithAuto" id="gridWithAutoWithoutSizeElement"></div> |
+<div class="grid definite gridWithAuto fontSpec" id="gridWithAutoWithChildrenElement"> |
<div class="gridItem"></div> |
</div> |
-<div class="grid gridWithEM" id="gridWithEMElement"></div> |
-<div class="grid gridWithViewPortPercentage" id="gridWithViewPortPercentageElement"></div> |
-<div class="grid gridWithFitContent" id="gridWithFitContentElement"></div> |
-<div class="grid gridWithFitAvailable" id="gridWithFitAvailableElement"></div> |
-<div class="grid gridWithMinMax" id="gridWithMinMaxElement"></div> |
-<div class="grid gridWithMinContent" id="gridWithMinContentElement"></div> |
-<div class="grid gridWithMinContent" id="gridWithMinContentWithChildrenElement"> |
+<div class="grid definite gridWithEM" id="gridWithEMElement"></div> |
+<div class="grid definite gridWithViewPortPercentage" id="gridWithViewPortPercentageElement"></div> |
+<div class="grid definite gridWithFitContent" id="gridWithFitContentElement"></div> |
+<div class="grid definite gridWithFitAvailable" id="gridWithFitAvailableElement"></div> |
+<div class="grid definite gridWithMinMax" id="gridWithMinMaxElement"></div> |
+<div class="grid definite gridWithMinContent" id="gridWithMinContentElement"></div> |
+<div class="grid definite gridWithMinContent" id="gridWithMinContentWithChildrenElement"> |
<div class="gridItem"></div> |
<div class="gridItem2"></div> |
</div> |
-<div class="grid gridWithMaxContent" id="gridWithMaxContentElement"></div> |
-<div class="grid gridWithMaxContent" id="gridWithMaxContentWithChildrenElement"> |
+<div class="grid definite gridWithMaxContent" id="gridWithMaxContentElement"></div> |
+<div class="grid definite gridWithMaxContent" id="gridWithMaxContentWithChildrenElement"> |
<div class="gridItem"></div> |
<div class="gridItem2"></div> |
</div> |
-<div class="grid gridWithFraction" id="gridWithFractionElement"></div> |
-<div class="grid gridWithCalc" id="gridWithCalcElement"></div> |
-<div class="grid gridWithCalcComplex" id="gridWithCalcComplexElement"></div> |
-<div class="grid gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMaxElement"></div> |
-<div class="grid gridWithCalcComplexInsideMinMax" id="gridWithCalcComplexInsideMinMaxElement"></div> |
-<div class="grid gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMaxElement"> |
+<div class="grid definite gridWithFraction" id="gridWithFractionElement"></div> |
+<div class="grid definite gridWithCalc" id="gridWithCalcElement"></div> |
+<div class="grid definite gridWithCalcComplex" id="gridWithCalcComplexElement"></div> |
+<div class="grid definite gridWithCalcInsideMinMax" id="gridWithCalcInsideMinMaxElement"></div> |
+<div class="grid definite gridWithCalcComplexInsideMinMax" id="gridWithCalcComplexInsideMinMaxElement"></div> |
+<div class="grid definite gridWithAutoInsideMinMax" id="gridWithAutoInsideMinMaxElement"> |
<div class="gridItem"></div> |
</div> |
<script src="resources/grid-definitions-parsing-utils.js"></script> |