Bug 1484267 [wpt PR 12552] - Sync Mozilla tests as of 2018-08-17, a=testonly
authorL. David Baron <dbaron@dbaron.org>
Wed, 22 Aug 2018 13:18:25 +0000
changeset 433094 e02d5a5d5498376588d1162f36a8440e8f4ec76b
parent 433093 cc030f559f30b24804d3e8d770c5d7be46878c87
child 433095 3d9ba45c5fc51add474e6639b49d94dc6314a0c9
push id34499
push usercsabou@mozilla.com
push dateThu, 23 Aug 2018 21:40:51 +0000
treeherdermozilla-central@49b70f7e6817 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1484267, 12552, 1483685
milestone63.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 1484267 [wpt PR 12552] - Sync Mozilla tests as of 2018-08-17, a=testonly Automatic update from web-platform-testsSync Mozilla tests as of https://hg.mozilla.org/mozilla-central/rev/131363332762842ba327166bdc361c6fffc4858f . (#12552) This contains two sets of changes from a single bug, [bug 1483685](https://bugzilla.mozilla.org/show_bug.cgi?id=1483685), by @dholbert, reviewed by @iyermihir. -- wpt-commits: 24876e8716a7500c35225cac471875df51818f8e wpt-pr: 12552
testing/web-platform/meta/MANIFEST.json
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml
testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/reftest.list
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -168506,16 +168506,28 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml",
        "=="
       ]
      ],
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml",
        "=="
       ]
@@ -168530,16 +168542,28 @@
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml",
        "=="
       ]
      ],
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001.xhtml": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001.xhtml",
      [
       [
        "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml",
        "=="
       ]
@@ -271349,21 +271373,31 @@
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml": [
     [
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml": [
     [
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml": [
     [
      {}
     ]
    ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-items-center-nested-001-ref.html": [
     [
      {}
@@ -573058,37 +573092,53 @@
    "876e5d6c2cbd282bd0e35dac0433a2413180f620",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-abspos-child-002.html": [
    "8234085681ddc0f72e8da84471363ecb08d4d460",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml": [
-   "33057bf5f0f8e0182850a0ad272cdddaac66a6a3",
+   "517b7f465ddc9059053b84219b57247afc22b4b7",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml": [
-   "bb0a8cda64b19b85c612a0609d35c400eefaa840",
+   "bb592b74a8b761230b1a4c56398d961c4619b066",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml": [
-   "a1e192102ea9cbbdc5685085d47dfdd8b81d5023",
+   "3de740e9a3f8e59955d66de1771369eaf73b988c",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml": [
+   "f0d286494e428fcc6afbe642da0ea6fd0ae1ccc8",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml": [
+   "902b26ba23e44659f5a111617439889c09875e32",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml": [
-   "1bac2bcda1dfc8f919211c26841f55883c249180",
+   "f09e2a448da8a5466bffd31d505cd90cbc34fcc2",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml": [
-   "c4236ef0406c48c5aec75d17d207cfb069591793",
+   "56bdd5fe4020ea641aa0c778fc49b500e4de2b6d",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml": [
-   "54a8ed31f9637eb9781a5a1fafacec498f402cf9",
+   "002f20fb3335c7e0cb890dd267f36adeabab4f1b",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml": [
+   "b514d840489dcc027be492ffd5081fe0a124b8e4",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml": [
+   "b4a8ccf3dd1f5890e5fad1cee0a49ba96f12d49f",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001-ref.xhtml": [
    "2902a09c163759bd604b53e0b04a0be8f3bdb8c6",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-wmvert-001.xhtml": [
    "e0c40a72553100dc9e8652fc7e6f7bef17a2b725",
@@ -574502,17 +574552,17 @@
    "90ee38856cccd568352c5b6a4f14acc2274605c6",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/position-absolute-containing-block-002.html": [
    "aecbf0b4c997ceb748496d7fa09aed6ba8c0f92a",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/reftest.list": [
-   "b51226706eae57ce44afdbbc24d5fb74e4225d34",
+   "ee725d99ed9c669b6010132c9ca91e3f78899886",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/Ahem.ttf": [
    "ac81cb03165ab831a36abb59145ff7a2f5675fb9",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/support/ahem.css": [
    "82ee466791e8c3319ac518e58d6806c1616d783b",
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001-ref.xhtml
@@ -139,32 +139,32 @@
       <div class="c" style="margin-top: 30px"/>
     </div>
 
     <!-- start -->
     <div class="flexbox">
       <div class="a"/>
     </div>
     <div class="flexbox">
+      <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
     </div>
     <div class="flexbox">
-      <div class="c"/>
+      <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
+      <div class="c"/>
     </div>
 
     <!-- end -->
     <div class="flexbox">
       <div class="a" style="margin-top: 190px"/>
     </div>
     <div class="flexbox">
-      <div class="b" style="margin-top: 160px"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
+      <div class="a" style="margin-top: 160px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
     </div>
     <div class="flexbox">
-      <div class="c" style="margin-top: 120px"/>
+      <div class="a" style="margin-top: 120px"/>
       <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
+      <div class="c"/>
     </div>
   </body>
 </html>
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001a.xhtml
@@ -144,36 +144,36 @@
     </div>
     <div class="flexbox" style="align-content: space-evenly">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- start -->
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- end -->
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
   </body>
 </html>
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-001b.xhtml
@@ -145,36 +145,36 @@
     </div>
     <div class="flexbox" style="align-content: space-evenly">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- start -->
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- end -->
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
   </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002-ref.xhtml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <style>
+      div.flexbox {
+        width: 20px;
+        height: 200px;
+        margin-right: 2px;
+        float: left;
+        background: lightgray;
+      }
+      div.a {
+        width: 20px;
+        height: 10px;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        height: 30px;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        height: 40px;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 10px;
+        height: 30px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="height:110px"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top:80px"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="margin-top:40px"/>
+      <div class="b" style="height: 70px"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top:40px"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="margin-top: 160px"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="margin-top: 120px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="margin-top: 80px"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="margin-top: 60px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top: 160px"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/>
+      <div class="b" style="margin-top: 60px"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top: 60px"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="margin-top: 40px"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top: 80px"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="margin-top: 20px"/>
+      <div class="b" style="margin-top: 40px"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top: 40px"/>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="margin-top: calc(160px / 3)"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top: calc(160px / 3)"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="margin-top: 30px"/>
+      <div class="b" style="margin-top: 30px"><div class="fixedSizeChild"/></div>
+      <div class="a" style="margin-top: 30px"/>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="c"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox">
+      <div class="a" style="margin-top: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="b" style="margin-top: 160px"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="c" style="margin-top: 120px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="a"/>
+    </div>
+  </body>
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-horiz-002.xhtml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of row wrap-reverse flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a row wrap-reverse flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <link rel="match" href="flexbox-align-content-horiz-002-ref.xhtml"/>
+    <style>
+      div.flexbox {
+        width: 20px; /* Skinny, to force us to wrap */
+        height: 200px;
+        display: flex;
+        flex-wrap: wrap-reverse;
+        margin-right: 2px;
+        float: left;
+        background: lightgray;
+      }
+      div.a {
+        width: 20px;
+        height: 10px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: 20px;
+        height: auto; /* height comes from contents */
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 20px;
+        height: 40px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 10px;
+        height: 30px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+  </body>
+</html>
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001-ref.xhtml
@@ -142,32 +142,32 @@
       <div class="c" style="margin-left: 30px"/>
     </div>
 
     <!-- start -->
     <div class="flexbox">
       <div class="a"/>
     </div>
     <div class="flexbox">
+      <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
     </div>
     <div class="flexbox">
-      <div class="c"/>
+      <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
+      <div class="c"/>
     </div>
 
     <!-- end -->
     <div class="flexbox">
       <div class="a" style="margin-left: 190px"/>
     </div>
     <div class="flexbox">
-      <div class="b" style="margin-left: 160px"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
+      <div class="a" style="margin-left: 160px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
     </div>
     <div class="flexbox">
-      <div class="c" style="margin-left: 120px"/>
+      <div class="a" style="margin-left: 120px"/>
       <div class="b"><div class="fixedSizeChild"/></div>
-      <div class="a"/>
+      <div class="c"/>
     </div>
   </body>
 </html>
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001a.xhtml
@@ -144,36 +144,36 @@
     </div>
     <div class="flexbox" style="align-content: space-evenly">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- start -->
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- end -->
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
   </body>
 </html>
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-001b.xhtml
@@ -145,36 +145,36 @@
     </div>
     <div class="flexbox" style="align-content: space-evenly">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- start -->
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: start; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: start">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
 
     <!-- end -->
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
     </div>
-    <div class="flexbox" style="align-content: end; flex-wrap: wrap-reverse">
+    <div class="flexbox" style="align-content: end">
       <div class="a"/>
       <div class="b"><div class="fixedSizeChild"/></div>
       <div class="c"/>
     </div>
   </body>
 </html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002-ref.xhtml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Reftest Reference</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <style>
+      div.flexbox {
+        width: 200px;
+        margin-bottom: 2px;
+        background: lightgray;
+        height: 20px;
+        clear: all;
+      }
+      div.a {
+        width: 10px;
+        height: 20px;
+        background: lightgreen;
+        float: right;
+      }
+      div.b {
+        width: 30px;
+        height: 20px;
+        background: pink;
+        float: right;
+      }
+      div.c {
+        width: 40px;
+        height: 20px;
+        background: orange;
+        float: right;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 30px;
+        height: 10px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b" style="margin-right:80px; width:110px"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b" style="margin-right: 40px; width: 70px"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox">
+      <div class="a" style="margin-right: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 160px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 120px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox">
+      <div class="a" style="margin-right: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 80px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 60px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b" style="margin-right: 160px"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b" style="margin-right: 60px"><div class="fixedSizeChild"/></div>
+      <div class="c" style="margin-right: 60px"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox">
+      <div class="a" style="margin-right: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 40px"/>
+      <div class="b" style="margin-right: 80px"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 20px"/>
+      <div class="b" style="margin-right: 40px"><div class="fixedSizeChild"/></div>
+      <div class="c" style="margin-right: 40px"/>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox">
+      <div class="a" style="margin-right: 95px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: calc(160px / 3)"/>
+      <div class="b" style="margin-right: calc(160px / 3)"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 30px"/>
+      <div class="b" style="margin-right: 30px"><div class="fixedSizeChild"/></div>
+      <div class="c" style="margin-right: 30px"/>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox">
+      <div class="a" style="margin-right: 190px"/>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 160px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a" style="margin-right: 120px"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+  </body>
+</html>
new file mode 100644
--- /dev/null
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-content-vert-002.xhtml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!-- Testcase with a series of column wrap-reverse flex containers, with 1-3 flex lines,
+     testing each possible value of the 'align-content' property. -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>CSS Test: Testing 'align-content' in a column wrap-reverse flex container</title>
+    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
+    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#align-content-property"/>
+    <link rel="match" href="flexbox-align-content-vert-002-ref.xhtml"/>
+    <style>
+      div.flexbox {
+        width: 200px;
+        height: 20px; /* Short, to force us to wrap */
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap-reverse;
+        margin-bottom: 2px;
+        background: lightgray;
+      }
+      div.a {
+        width: 10px;
+        height: 20px;
+        flex: none;
+        background: lightgreen;
+      }
+      div.b {
+        width: auto; /* width comes from contents */
+        height: 20px;
+        flex: none;
+        background: pink;
+      }
+      div.c {
+        width: 40px;
+        height: 20px;
+        flex: none;
+        background: orange;
+      }
+
+      /* Inside of 'b': */
+      div.fixedSizeChild {
+        width: 30px;
+        height: 10px;
+        background: purple;
+      }
+    </style>
+  </head>
+  <body>
+
+    <!-- default (stretch) -->
+    <div class="flexbox">
+      <div class="a"/>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- flex-start -->
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- flex-end -->
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: flex-end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- center -->
+    <div class="flexbox" style="align-content: center">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: center">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- space-between -->
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: space-between">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- space-around -->
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: space-around">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- space-evenly -->
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: space-evenly">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- start -->
+    <div class="flexbox" style="align-content: start">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: start">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+
+    <!-- end -->
+    <div class="flexbox" style="align-content: end">
+      <div class="a"/>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+    </div>
+    <div class="flexbox" style="align-content: end">
+      <div class="a"/>
+      <div class="b"><div class="fixedSizeChild"/></div>
+      <div class="c"/>
+    </div>
+  </body>
+</html>
--- a/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/reftest.list
+++ b/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/reftest.list
@@ -4,18 +4,20 @@
 == flexbox-abspos-child-002.html flexbox-abspos-child-002-ref.html
 
 # Tests for handling anonymous flex items
 == flexbox-anonymous-items-001.html flexbox-anonymous-items-001-ref.html
 
 # Tests for alignment of flex lines (align-content property)
 == flexbox-align-content-horiz-001a.xhtml flexbox-align-content-horiz-001-ref.xhtml
 == flexbox-align-content-horiz-001b.xhtml flexbox-align-content-horiz-001-ref.xhtml
+== flexbox-align-content-horiz-002.xhtml flexbox-align-content-horiz-002-ref.xhtml
 == flexbox-align-content-vert-001a.xhtml  flexbox-align-content-vert-001-ref.xhtml
 == flexbox-align-content-vert-001b.xhtml  flexbox-align-content-vert-001-ref.xhtml
+== flexbox-align-content-vert-002.xhtml flexbox-align-content-vert-002-ref.xhtml
 == flexbox-align-content-wmvert-001.xhtml  flexbox-align-content-wmvert-001-ref.xhtml
 
 # Tests for cross-axis alignment (align-self / align-items properties)
 == flexbox-align-self-baseline-horiz-001a.xhtml flexbox-align-self-baseline-horiz-001-ref.xhtml
 == flexbox-align-self-baseline-horiz-001b.xhtml flexbox-align-self-baseline-horiz-001-ref.xhtml
 == flexbox-align-self-baseline-horiz-002.xhtml flexbox-align-self-baseline-horiz-002-ref.xhtml
 == flexbox-align-self-baseline-horiz-003.xhtml flexbox-align-self-baseline-horiz-003-ref.xhtml
 == flexbox-align-self-baseline-horiz-004.xhtml flexbox-align-self-baseline-horiz-004-ref.xhtml