Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html

Issue 548263002: [CSSGridLayout] Resolved value of grid-template-* to include every track (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
diff --git a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
index 5e7be1e6400b085529fb19863ed4496a4e8de4fd..3bcd62d00fff6c324b84449dca47e2405fe441a0 100644
--- a/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set.html
@@ -17,28 +17,49 @@
grid-auto-rows: min-content;
grid-auto-columns: max-content;
}
+
+.gridAutoFixedFixedWithFixedFixed {
+ grid-auto-rows: 30px;
+ grid-auto-columns: 40px;
+ grid-template-rows: 15px;
+ grid-template-columns: 20px;
+}
+
</style>
<script src="../../resources/js-test.js"></script>
+<script src="resources/grid-definitions-parsing-utils.js"></script>
</head>
<body>
<div class="grid gridAutoFixedFixed" id="gridAutoFixedFixed"></div>
<div class="grid gridAutoMinMax" id="gridAutoMinMax"></div>
<div class="grid gridAutoMinMaxContent" id="gridAutoMinMaxContent"></div>
+<div class="grid gridAutoFixedFixed" id="gridAutoFixedFixedWithChildren">
+ <div class="sizedToGridArea firstRowFirstColumn"></div>
+</div>
+<div class="grid gridAutoFixedFixedWithFixedFixed" id="gridAutoFixedFixedWithFixedFixedWithChildren">
+ <div class="sizedToGridArea thirdRowAutoColumn"></div>
+ <div class="sizedToGridArea autoRowThirdColumn"></div>
+</div>
<script>
description('Test that setting and getting grid-auto-columns and grid-auto-rows works as expected');
debug("Test getting grid-auto-columns and grid-auto-rows set through CSS");
-var gridAutoFixedFixed = document.getElementById("gridAutoFixedFixed");
-shouldBe("getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('grid-auto-rows')", "'30px'");
-shouldBe("getComputedStyle(gridAutoFixedFixed, '').getPropertyValue('grid-auto-columns')", "'50px'");
+testGridAutoDefinitionsValues(document.getElementById("gridAutoFixedFixed"), "30px", "50px");
+testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMax"), "minmax(10%, 15px)", "minmax(30%, 100px)");
+testGridAutoDefinitionsValues(document.getElementById("gridAutoMinMaxContent"), "min-content", "max-content");
-var gridAutoMinMax = document.getElementById("gridAutoMinMax");
-shouldBe("getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-auto-rows')", "'minmax(10%, 15px)'");
-shouldBe("getComputedStyle(gridAutoMinMax, '').getPropertyValue('grid-auto-columns')", "'minmax(30%, 100px)'");
+debug("");
+debug("Test that getting grid-template-columns and grid-template-rows set through CSS lists every track listed whether implicitly or explicitly created");
+testGridAutoDefinitionsValues(document.getElementById("gridAutoFixedFixedWithChildren"), "30px", "50px");
+testGridDefinitionsValues(document.getElementById("gridAutoFixedFixedWithChildren"), "50px", "30px");
+testGridAutoDefinitionsValues(document.getElementById("gridAutoFixedFixedWithFixedFixedWithChildren"), "30px", "40px");
+testGridDefinitionsValues(document.getElementById("gridAutoFixedFixedWithFixedFixedWithChildren"), "20px", "15px", "20px 40px 40px", "15px 30px 30px");
-var gridAutoMinMaxContent = document.getElementById("gridAutoMinMaxContent");
-shouldBe("getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-rows')", "'min-content'");
-shouldBe("getComputedStyle(gridAutoMinMaxContent, '').getPropertyValue('grid-auto-columns')", "'max-content'");
+debug("");
+debug("Test that grid-template-* definitions are not affected by grid-auto-* definitions");
+testGridDefinitionsValues(document.getElementById("gridAutoFixedFixed"), "none", "none");
+testGridDefinitionsValues(document.getElementById("gridAutoMinMax"), "none", "none");
+testGridDefinitionsValues(document.getElementById("gridAutoMinMaxContent"), "none", "none");
debug("");
debug("Test the initial value");
« no previous file with comments | « no previous file | LayoutTests/fast/css-grid-layout/grid-auto-columns-rows-get-set-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698