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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js

Issue 16404015: Unprefix -webkit-min-content and -webkit-max-content for grid layout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebaselined change 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
« no previous file with comments | « LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt ('k') | LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
diff --git a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
index 4f655444d08816f23f7586e1e0e3ece4e7be385d..4b3d51a518ce1a7e7f0589b66925c8b871a40d34 100755
--- a/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
+++ b/LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set.js
@@ -30,12 +30,12 @@ shouldBe("getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-columns')"
shouldBe("getComputedStyle(gridWithMinMax, '').getPropertyValue('grid-rows')", "'minmax(20px, 50%)'");
var gridWithMinContent = document.getElementById("gridWithMinContent");
-shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-columns')", "'-webkit-min-content'");
-shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-rows')", "'-webkit-min-content'");
+shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-columns')", "'min-content'");
+shouldBe("getComputedStyle(gridWithMinContent, '').getPropertyValue('grid-rows')", "'min-content'");
var gridWithMaxContent = document.getElementById("gridWithMaxContent");
-shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-columns')", "'-webkit-max-content'");
-shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-rows')", "'-webkit-max-content'");
+shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-columns')", "'max-content'");
+shouldBe("getComputedStyle(gridWithMaxContent, '').getPropertyValue('grid-rows')", "'max-content'");
var gridWithFraction = document.getElementById("gridWithFraction");
shouldBe("getComputedStyle(gridWithFraction, '').getPropertyValue('grid-columns')", "'1fr'");
@@ -88,17 +88,17 @@ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'150px'
element = document.createElement("div");
document.body.appendChild(element);
-element.style.gridColumns = "-webkit-min-content";
-element.style.gridRows = "-webkit-min-content";
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'-webkit-min-content'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'-webkit-min-content'");
+element.style.gridColumns = "min-content";
+element.style.gridRows = "min-content";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'min-content'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'min-content'");
element = document.createElement("div");
document.body.appendChild(element);
-element.style.gridColumns = "-webkit-max-content";
-element.style.gridRows = "-webkit-max-content";
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'-webkit-max-content'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'-webkit-max-content'");
+element.style.gridColumns = "max-content";
+element.style.gridRows = "max-content";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'max-content'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'max-content'");
debug("");
debug("Test getting and setting grid-columns and grid-rows to minmax() values through JS");
@@ -119,33 +119,33 @@ shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax
element = document.createElement("div");
document.body.appendChild(element);
-element.style.gridColumns = "minmax(-webkit-min-content, 8vh)";
-element.style.gridRows = "minmax(10vw, -webkit-min-content)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(-webkit-min-content, 48px)'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(80px, -webkit-min-content)'");
+element.style.gridColumns = "minmax(min-content, 8vh)";
+element.style.gridRows = "minmax(10vw, min-content)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(min-content, 48px)'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(80px, min-content)'");
element = document.createElement("div");
document.body.appendChild(element);
element.style.font = "10px Ahem";
-element.style.gridColumns = "minmax(22em, -webkit-max-content)";
-element.style.gridRows = "minmax(-webkit-max-content, 5em)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(220px, -webkit-max-content)'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(-webkit-max-content, 50px)'");
+element.style.gridColumns = "minmax(22em, max-content)";
+element.style.gridRows = "minmax(max-content, 5em)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(220px, max-content)'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(max-content, 50px)'");
element = document.createElement("div");
document.body.appendChild(element);
element.style.font = "10px Ahem";
-element.style.gridColumns = "minmax(22em, -webkit-max-content)";
-element.style.gridRows = "minmax(-webkit-max-content, 5em)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(220px, -webkit-max-content)'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(-webkit-max-content, 50px)'");
+element.style.gridColumns = "minmax(22em, max-content)";
+element.style.gridRows = "minmax(max-content, 5em)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(220px, max-content)'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(max-content, 50px)'");
element = document.createElement("div");
document.body.appendChild(element);
-element.style.gridColumns = "minmax(-webkit-min-content, -webkit-max-content)";
-element.style.gridRows = "minmax(-webkit-max-content, -webkit-min-content)";
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(-webkit-min-content, -webkit-max-content)'");
-shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(-webkit-max-content, -webkit-min-content)'");
+element.style.gridColumns = "minmax(min-content, max-content)";
+element.style.gridRows = "minmax(max-content, min-content)";
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-columns')", "'minmax(min-content, max-content)'");
+shouldBe("getComputedStyle(element, '').getPropertyValue('grid-rows')", "'minmax(max-content, min-content)'");
// Unit comparison should be case-insensitive.
element = document.createElement("div");
« no previous file with comments | « LayoutTests/fast/css-grid-layout/named-grid-line-get-set-expected.txt ('k') | LayoutTests/fast/css-grid-layout/resources/grid-columns-rows-get-set-multiple.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698