Bug 1382369 - stylo: store specified value of grid layout repeat() function. Tests. r=mats
authorFernando Jimenez Moreno <ferjmoreno@gmail.com>
Mon, 11 Sep 2017 11:30:04 +0200
changeset 380039 8be3c451ff86b00894d66754f1975b8343440abd
parent 380038 ecae1c71816b6d2aa21e520cb444f2cefb21ff91
child 380040 0f9e4072dbf82fb750bc0adbcfc093f3e50cdf7b
push id32476
push userkwierso@gmail.com
push dateMon, 11 Sep 2017 20:07:09 +0000
treeherdermozilla-central@15128312c02a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs1382369
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1382369 - stylo: store specified value of grid layout repeat() function. Tests. r=mats
layout/style/test/test_grid_shorthand_serialization.html
--- a/layout/style/test/test_grid_shorthand_serialization.html
+++ b/layout/style/test/test_grid_shorthand_serialization.html
@@ -21,16 +21,18 @@ var initial_values = {
     gridTemplateColumns: "none",
     gridAutoFlow: "row",
     gridAutoRows: "auto",
     gridAutoColumns: "auto",
     gridRowGap: "0px",
     gridColumnGap: "0px",
 };
 
+const isStylo = SpecialPowers.DOMWindowUtils.isStyledByServo;
+
 // For various specified values of the grid-template subproperties,
 // test the serialization of the shorthand.
 var grid_template_test_cases = [
     {
         gridTemplateColumns: "100px",
         shorthand: "none / 100px",
     },
     {
@@ -63,23 +65,23 @@ var grid_template_test_cases = [
     {
         gridTemplateAreas: "\"a\"",
         gridTemplateRows: "[foo] 20px [bar]",
         shorthand: "[foo] \"a\" 20px [bar]",
     },
     {
         gridTemplateAreas: "\"a\"",
         gridTemplateRows: "[foo] repeat(1, 20px) [bar]",
-        shorthand: "[foo] \"a\" 20px [bar]",
+        shorthand: isStylo ? "" : "[foo] \"a\" 20px [bar]",
     },
     {
         gridTemplateAreas: "\"a a\"",
         gridTemplateColumns: "repeat(2, 100px)",
         gridTemplateRows: "auto",
-        shorthand: "\"a a\" auto / 100px 100px",
+        shorthand: isStylo ? "" : "\"a a\" auto / 100px 100px",
     },
     // Combinations of longhands that make the shorthand non-serializable:
     {
         gridTemplateAreas: "\"a\"",
         gridTemplateRows: "20px 100px",
         shorthand: "",
     },
     {