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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html

Issue 16959008: [CSS Grid Layout] Rename grid-{rows|columns} to grid-definition-{rows|columns} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added a missing fix for a test in webexposed/ Created 7 years, 6 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
« LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt ('K') | « LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html ('k') | LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt » ('j') | Source/core/css/CSSProperty.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
diff --git a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
index f63b9f60017f004f61d4d4aea17741c8ceff8be4..230f30f586d46e6a935390b3629dd57fec9773a3 100755
--- a/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
+++ b/LayoutTests/fast/css-grid-layout/named-grid-line-get-set.html
@@ -8,28 +8,28 @@ if (window.testRunner)
<link href="resources/grid.css" rel="stylesheet">
<style>
.gridWithFixed {
- grid-columns: "first" 10px;
- grid-rows: "first" 15px;
+ grid-definition-columns: "first" 10px;
+ grid-definition-rows: "first" 15px;
}
.gridWithPercent {
- grid-columns: 53% "last";
- grid-rows: 27% "last";
+ grid-definition-columns: 53% "last";
+ grid-definition-rows: 27% "last";
}
.gridWithAuto {
- grid-columns: "first" auto;
- grid-rows: auto "last";
+ grid-definition-columns: "first" auto;
+ grid-definition-rows: auto "last";
}
.gridWithMinMax {
- grid-columns: "first" minmax(10%, 15px);
- grid-rows: minmax(20px, 50%) "last";
+ grid-definition-columns: "first" minmax(10%, 15px);
+ grid-definition-rows: minmax(20px, 50%) "last";
}
.gridWithFixedMultiple {
- grid-columns: "first" "nav" 10px "last";
- grid-rows: "first" "nav" 15px "last";
+ grid-definition-columns: "first" "nav" 10px "last";
+ grid-definition-rows: "first" "nav" 15px "last";
}
.gridWithPercentageSameStringMultipleTimes {
- grid-columns: "first" "nav" 10% "nav" 15% "last";
- grid-rows: "first" "nav2" 25% "nav2" 75% "last";
+ grid-definition-columns: "first" "nav" 10% "nav" 15% "last";
+ grid-definition-rows: "first" "nav2" 25% "nav2" 75% "last";
}
</style>
<script src="../js/resources/js-test-pre.js"></script>
@@ -42,21 +42,21 @@ if (window.testRunner)
<div class="grid gridWithFixedMultiple" id="gridWithFixedMultiple"></div>
<div class="grid gridWithPercentageSameStringMultipleTimes" id="gridWithPercentageSameStringMultipleTimes"></div>
<script>
- description('Test that setting and getting grid-columns and grid-rows works as expected');
+ description('Test that setting and getting grid-definition-columns and grid-definition-rows works as expected');
- function testValue(gridElement, namedGridColumns, namedGridRows)
+ function testValue(gridElement, namedGridDefinitionColumns, namedGridDefinitionRows)
{
this.gridElement = gridElement;
- shouldBeEqualToString("getComputedStyle(gridElement, '').getPropertyValue('grid-columns')", namedGridColumns);
- shouldBeEqualToString("getComputedStyle(gridElement, '').getPropertyValue('grid-rows')", namedGridRows);
+ shouldBeEqualToString("getComputedStyle(gridElement, '').getPropertyValue('grid-definition-columns')", namedGridDefinitionColumns);
+ shouldBeEqualToString("getComputedStyle(gridElement, '').getPropertyValue('grid-definition-rows')", namedGridDefinitionRows);
}
- function testCSSValue(gridElementId, namedGridColumns, namedGridRows)
+ function testCSSValue(gridElementId, namedGridDefinitionColumns, namedGridDefinitionRows)
{
- testValue(document.getElementById(gridElementId), namedGridColumns, namedGridRows);
+ testValue(document.getElementById(gridElementId), namedGridDefinitionColumns, namedGridDefinitionRows);
}
- debug("Test getting grid-columns and grid-rows set through CSS");
+ debug("Test getting grid-definition-columns and grid-definition-rows set through CSS");
testCSSValue("gridWithFixedElement", "first 10px", "first 15px");
testCSSValue("gridWithPercentElement", "53% last", "27% last");
testCSSValue("gridWithAutoElement", "first auto", "auto last");
@@ -65,87 +65,87 @@ if (window.testRunner)
testCSSValue("gridWithPercentageSameStringMultipleTimes", "nav first 10% nav 15% last", "first nav2 25% nav2 75% last");
debug("");
- debug("Test getting and setting grid-columns and grid-rows through JS");
+ debug("Test getting and setting grid-definition-columns and grid-definition-rows through JS");
var element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' 18px";
- element.style.gridRows = "66px 'last'";
+ element.style.gridDefinitionColumns = "'first' 18px";
+ element.style.gridDefinitionRows = "66px 'last'";
testValue(element, "first 18px", "66px last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' 55%";
- element.style.gridRows = "40% 'last'";
+ element.style.gridDefinitionColumns = "'first' 55%";
+ element.style.gridDefinitionRows = "40% 'last'";
testValue(element, "first 55%", "40% last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' auto";
- element.style.gridRows = "auto 'last'";
+ element.style.gridDefinitionColumns = "'first' auto";
+ element.style.gridDefinitionRows = "auto 'last'";
testValue(element, "first auto", "auto last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' -webkit-min-content";
- element.style.gridRows = "-webkit-min-content 'last'";
+ element.style.gridDefinitionColumns = "'first' -webkit-min-content";
+ element.style.gridDefinitionRows = "-webkit-min-content 'last'";
testValue(element, "first -webkit-min-content", "-webkit-min-content last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' -webkit-max-content";
- element.style.gridRows = "-webkit-max-content 'last'";
+ element.style.gridDefinitionColumns = "'first' -webkit-max-content";
+ element.style.gridDefinitionRows = "-webkit-max-content 'last'";
testValue(element, "first -webkit-max-content", "-webkit-max-content last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' minmax(55%, 45px)";
- element.style.gridRows = "minmax(30px, 40%) 'last'";
+ element.style.gridDefinitionColumns = "'first' minmax(55%, 45px)";
+ element.style.gridDefinitionRows = "minmax(30px, 40%) 'last'";
testValue(element, "first minmax(55%, 45px)", "minmax(30px, 40%) last");
element = document.createElement("div");
document.body.appendChild(element);
element.style.font = "10px Ahem";
- element.style.gridColumns = "'first' minmax(22em, -webkit-max-content)";
- element.style.gridRows = "minmax(-webkit-max-content, 5em) 'last'";
+ element.style.gridDefinitionColumns = "'first' minmax(22em, -webkit-max-content)";
+ element.style.gridDefinitionRows = "minmax(-webkit-max-content, 5em) 'last'";
testValue(element, "first minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) last");
element = document.createElement("div");
document.body.appendChild(element);
element.style.font = "10px Ahem";
- element.style.gridColumns = "'first' minmax(22em, -webkit-max-content)";
- element.style.gridRows = "minmax(-webkit-max-content, 5em) 'last'";
+ element.style.gridDefinitionColumns = "'first' minmax(22em, -webkit-max-content)";
+ element.style.gridDefinitionRows = "minmax(-webkit-max-content, 5em) 'last'";
testValue(element, "first minmax(220px, -webkit-max-content)", "minmax(-webkit-max-content, 50px) last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' minmax(-webkit-min-content, -webkit-max-content)";
- element.style.gridRows = "minmax(-webkit-max-content, -webkit-min-content) 'last'";
+ element.style.gridDefinitionColumns = "'first' minmax(-webkit-min-content, -webkit-max-content)";
+ element.style.gridDefinitionRows = "minmax(-webkit-max-content, -webkit-min-content) 'last'";
testValue(element, "first minmax(-webkit-min-content, -webkit-max-content)", "minmax(-webkit-max-content, -webkit-min-content) last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'last'";
- element.style.gridRows = "'first' 'nav' minmax(-webkit-max-content, -webkit-min-content) 'last'";
+ element.style.gridDefinitionColumns = "'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'last'";
+ element.style.gridDefinitionRows = "'first' 'nav' minmax(-webkit-max-content, -webkit-min-content) 'last'";
testValue(element, "nav first minmax(-webkit-min-content, -webkit-max-content) last", "nav first minmax(-webkit-max-content, -webkit-min-content) last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'nav' auto 'last'";
- element.style.gridRows = "'first' 'nav2' minmax(-webkit-max-content, -webkit-min-content) 'nav2' minmax(10px, 15px) 'last'";
+ element.style.gridDefinitionColumns = "'first' 'nav' minmax(-webkit-min-content, -webkit-max-content) 'nav' auto 'last'";
+ element.style.gridDefinitionRows = "'first' 'nav2' minmax(-webkit-max-content, -webkit-min-content) 'nav2' minmax(10px, 15px) 'last'";
testValue(element, "nav first minmax(-webkit-min-content, -webkit-max-content) nav auto last", "first nav2 minmax(-webkit-max-content, -webkit-min-content) nav2 minmax(10px, 15px) last");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'foo' 'bar' auto 'foo' auto 'bar'";
- element.style.gridRows = "'foo' 'bar' auto 'foo' auto 'bar'";
+ element.style.gridDefinitionColumns = "'foo' 'bar' auto 'foo' auto 'bar'";
+ element.style.gridDefinitionRows = "'foo' 'bar' auto 'foo' auto 'bar'";
testValue(element, "foo bar auto foo auto bar", "foo bar auto foo auto bar");
debug("");
- debug("Test getting and setting invalid grid-columns and grid-rows through JS");
+ debug("Test getting and setting invalid grid-definition-columns and grid-definition-rows through JS");
element = document.createElement("div");
document.body.appendChild(element);
- element.style.gridColumns = "'foo'";
- element.style.gridRows = "'bar";
+ element.style.gridDefinitionColumns = "'foo'";
+ element.style.gridDefinitionRows = "'bar";
testValue(element, "none", "none");
</script>
<script src="../js/resources/js-test-post.js"></script>
« LayoutTests/fast/css-grid-layout/grid-element-change-rows-repaint-expected.txt ('K') | « LayoutTests/fast/css-grid-layout/minmax-spanning-resolution-rows.html ('k') | LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt » ('j') | Source/core/css/CSSProperty.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698