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

Unified Diff: LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html

Issue 146773002: [CSS Grid Layout] Rename grid-definition-{columns|rows} to match the new syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed renaming issues with some tests. Created 6 years, 11 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
Index: LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
diff --git a/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html b/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
index 07e122fa327ec2b90ac07cb28c73b943a1f95a1d..2b4c5f6143a26908ee1beb83090023d99a636460 100644
--- a/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/grid-element-repeat-get-set.html
@@ -28,48 +28,48 @@ if (window.testRunner)
}
.singleSingleTrackRepeat {
- grid-definition-rows: repeat(1, 18px);
- grid-definition-columns: repeat(1, 15%);
+ grid-template-rows: repeat(1, 18px);
+ grid-template-columns: repeat(1, 15%);
}
.twoSingleTrackRepeat {
- grid-definition-rows: repeat(2, auto);
- grid-definition-columns: repeat(2, minmax(15px, 50%));
+ grid-template-rows: repeat(2, auto);
+ grid-template-columns: repeat(2, minmax(15px, 50%));
}
.twoDoubleTrackRepeat {
- grid-definition-rows: repeat(2, minmax(5px, 10px) auto);
- grid-definition-columns: repeat(2, auto minmax(100px, 120px));
+ grid-template-rows: repeat(2, minmax(5px, 10px) auto);
+ grid-template-columns: repeat(2, auto minmax(100px, 120px));
}
.twoDoubleTrackWithNamedGridLineRepeat {
- grid-definition-rows: repeat(2, 10px (start) auto (end));
- grid-definition-columns: repeat(2, auto (middle) 250px (end));
+ grid-template-rows: repeat(2, 10px (start) auto (end));
+ grid-template-columns: repeat(2, auto (middle) 250px (end));
}
.twoDoubleTrackWithTrailingNamedGridLineRepeat {
- grid-definition-rows: repeat(2, (before) 10px);
- grid-definition-columns: repeat(2, (before) auto);
+ grid-template-rows: repeat(2, (before) 10px);
+ grid-template-columns: repeat(2, (before) auto);
}
.trailingNamedGridLineRepeat {
- grid-definition-rows: repeat(1, 10px) (end);
- grid-definition-columns: repeat(1, 250px) (end);
+ grid-template-rows: repeat(1, 10px) (end);
+ grid-template-columns: repeat(1, 250px) (end);
}
.leadingNamedGridLineRepeat {
- grid-definition-rows: (start) repeat(2, 10px);
- grid-definition-columns: (start) repeat(2, 250px);
+ grid-template-rows: (start) repeat(2, 10px);
+ grid-template-columns: (start) repeat(2, 250px);
}
.mixRepeatAfterNonRepeat {
- grid-definition-rows: auto repeat(2, 10px);
- grid-definition-columns: (start) 140px repeat(2, 250px);
+ grid-template-rows: auto repeat(2, 10px);
+ grid-template-columns: (start) 140px repeat(2, 250px);
}
.mixNonRepeatAfterRepeat {
- grid-definition-rows: repeat(2, 10px) (end) auto;
- grid-definition-columns: repeat(2, 250px) 15% (last);
+ grid-template-rows: repeat(2, 10px) (end) auto;
+ grid-template-columns: repeat(2, 250px) 15% (last);
}
</style>
<script src="../../resources/js-test.js"></script>
@@ -100,9 +100,9 @@ if (window.testRunner)
<script src="resources/grid-definitions-parsing-utils.js"></script>
<script>
- description('Test that setting and getting grid-definition-columns and grid-definition-rows with repeat() works as expected');
+ description('Test that setting and getting grid-template-columns and grid-template-rows with repeat() works as expected');
- debug("Test getting grid-definition-columns and grid-definition-rows set through CSS");
+ debug("Test getting grid-template-columns and grid-template-rows set through CSS");
testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeatWithSize"), "120px", "18px");
testGridDefinitionsValues(document.getElementById("singleSingleTrackRepeatWithoutSize"), "0px", "18px");
testGridDefinitionsValues(document.getElementById("twoSingleTrackRepeat"), "400px 400px", "0px 0px");
@@ -120,8 +120,8 @@ if (window.testRunner)
function testInvalidSyntax(gridColumn) {
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridDefinitionColumns = gridColumn;
- shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-definition-columns')", "none");
+ element.style.gridTemplateColumns = gridColumn;
+ shouldBeEqualToString("window.getComputedStyle(element, '').getPropertyValue('grid-template-columns')", "none");
document.body.removeChild(element);
}
testInvalidSyntax("repeat(");

Powered by Google App Engine
This is Rietveld 408576698