Bug 1483685 part 1: Move flexbox-align-content-horizrev-001.xhtml (and its vertrev variant) to w3c-css directory, and add "start/end" cases inside it. r=mihir
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 15 Aug 2018 14:48:45 -0700
changeset 487155 7400a9b3fb353b21b5a25b9927e14bb348335625
parent 487120 9e05198aa74aa76790001aa403d6d7e33b49f9dd
child 487156 c22409215ce2225bcb881e38094117cee93cf598
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmihir
bugs1483685
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 1483685 part 1: Move flexbox-align-content-horizrev-001.xhtml (and its vertrev variant) to w3c-css directory, and add "start/end" cases inside it. r=mihir
layout/reftests/flexbox/flexbox-align-content-horizrev-001-ref.xhtml
layout/reftests/flexbox/flexbox-align-content-horizrev-001.xhtml
layout/reftests/flexbox/flexbox-align-content-vertrev-001-ref.xhtml
layout/reftests/flexbox/flexbox-align-content-vertrev-001.xhtml
layout/reftests/flexbox/reftest.list
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-002-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-002.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-002-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-002.xhtml
layout/reftests/w3c-css/submitted/flexbox/reftest.list
--- a/layout/reftests/flexbox/reftest.list
+++ b/layout/reftests/flexbox/reftest.list
@@ -7,22 +7,16 @@
 #
 # Where possible & practical, we should try to address these so we can migrate
 # tests over to the w3c-css directory, so that they can become part of the
 # W3C's test suite.
 
 # SUBDIRECTORY: Reftests for paginated flex containers
 include pagination/reftest.list
 
-# XXXdholbert These tests should move to w3c-css/submitted once we've closed
-# out bug 1207698 and updated these tests' expectations & alignment keyword
-# usage accordingly:
-== flexbox-align-content-horizrev-001.xhtml flexbox-align-content-horizrev-001-ref.xhtml
-== flexbox-align-content-vertrev-001.xhtml flexbox-align-content-vertrev-001-ref.xhtml
-
 # Tests for cross-axis alignment (align-self / align-items properties)
 fails == flexbox-align-self-baseline-horiz-2.xhtml  flexbox-align-self-baseline-horiz-2-ref.xhtml # bug 793456, and possibly others
 # This one fails on windows R (but not Ru, strangely) and GTK.
 # On Windows R and GTK, the single-line <label> flex item has a different
 # background size in test vs. ref
 fuzzy-if(cocoaWidget,0-1,0-2) random-if(winWidget||gtkWidget) skip-if(Android) == flexbox-align-self-baseline-horiz-3.xhtml  flexbox-align-self-baseline-horiz-3-ref.xhtml # XXXdholbert investigate the random-if. The skip-if(Android) is because checkbox/radio appearance:none doesn't work as expected.
 == flexbox-align-self-baseline-horiz-4.xhtml flexbox-align-self-baseline-horiz-4-ref.xhtml
 == flexbox-item-align-self-dynamic-pos-001.html flexbox-item-align-self-dynamic-pos-001-ref.html
rename from layout/reftests/flexbox/flexbox-align-content-horizrev-001-ref.xhtml
rename to layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-002-ref.xhtml
--- a/layout/reftests/flexbox/flexbox-align-content-horizrev-001-ref.xhtml
+++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-002-ref.xhtml
@@ -133,10 +133,38 @@
       <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>
rename from layout/reftests/flexbox/flexbox-align-content-horizrev-001.xhtml
rename to layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-002.xhtml
--- a/layout/reftests/flexbox/flexbox-align-content-horizrev-001.xhtml
+++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-horiz-002.xhtml
@@ -5,17 +5,17 @@
 -->
 <!-- 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-horizrev-001-ref.xhtml"/>
+    <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;
@@ -142,10 +142,38 @@
       <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>
rename from layout/reftests/flexbox/flexbox-align-content-vertrev-001-ref.xhtml
rename to layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-002-ref.xhtml
--- a/layout/reftests/flexbox/flexbox-align-content-vertrev-001-ref.xhtml
+++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-002-ref.xhtml
@@ -136,10 +136,38 @@
       <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>
rename from layout/reftests/flexbox/flexbox-align-content-vertrev-001.xhtml
rename to layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-002.xhtml
--- a/layout/reftests/flexbox/flexbox-align-content-vertrev-001.xhtml
+++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-content-vert-002.xhtml
@@ -5,17 +5,17 @@
 -->
 <!-- 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-vertrev-001-ref.xhtml"/>
+    <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;
@@ -142,10 +142,38 @@
       <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/layout/reftests/w3c-css/submitted/flexbox/reftest.list
+++ b/layout/reftests/w3c-css/submitted/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