Bug 946835 part 3: Add reftest for baseline alignment in multiple lines in a 'flex-wrap:wrap-reverse" flex container. r=mats
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 12 Dec 2013 13:25:55 -0800
changeset 160277 31c92e4b907f6c134513dc0750e055394cd31413
parent 160276 7f94fdaa1b42e35a24ceabe0e527b4440b6d1b75
child 160278 3bf339937af50cbd408135d4a05ae5c2013b8982
push id25827
push userkwierso@gmail.com
push dateFri, 13 Dec 2013 03:13:04 +0000
treeherdermozilla-central@1bc33fa19b24 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs946835
milestone29.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 946835 part 3: Add reftest for baseline alignment in multiple lines in a 'flex-wrap:wrap-reverse" flex container. r=mats
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-3-ref.xhtml
layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-3.xhtml
layout/reftests/w3c-css/submitted/flexbox/reftest.list
copy from layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-2-ref.xhtml
copy to layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-3-ref.xhtml
--- a/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-2-ref.xhtml
+++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-3-ref.xhtml
@@ -28,29 +28,31 @@
 
       .big    { font: 24px sans-serif; }
       .medium { font: 14px sans-serif; }
       .small  { font: 8px sans-serif;  }
 
    </style>
   </head>
   <body>
+    <!-- Note: The lines are reversed here with respect to the testcase,
+         due to the testcase's "wrap-reverse". -->
     <div class="flexbox">
-      <!-- First flex line: Just 3 different sizes of text -->
-      <div class="big">a</div>
-      <div class="small">b</div>
-      <div class="medium">c</div>
+      <!-- Third flex line: other margin/padding amounts on each item -->
+      <div class="small" style="margin-top: 20px">g</div>
+      <div class="big">h</div>
+      <div class="medium" style="padding-bottom: 6px">i</div>
     </div>
     <div class="flexbox">
       <!-- Second flex line: different margin/padding amounts on each item,
            and one non-baseline-aligned item.-->
       <div class="medium" style="padding-top: 10px">d</div>
       <div class="medium" style="margin-bottom: 8px">e</div>
       <div class="medium" style="align-self: stretch">f</div>
     </div>
     <div class="flexbox">
-      <!-- Third flex line: other margin/padding amounts on each item -->
-      <div class="small" style="margin-top: 20px">g</div>
-      <div class="big">h</div>
-      <div class="medium" style="padding-bottom: 6px">i</div>
+      <!-- First flex line: Just 3 different sizes of text -->
+      <div class="big">a</div>
+      <div class="small">b</div>
+      <div class="medium">c</div>
     </div>
   </body>
 </html>
copy from layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
copy to layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-3.xhtml
--- a/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-2.xhtml
+++ b/layout/reftests/w3c-css/submitted/flexbox/flexbox-align-self-baseline-horiz-3.xhtml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
      Any copyright is dedicated to the Public Domain.
      http://creativecommons.org/publicdomain/zero/1.0/
 -->
 <!-- Testcase for behavior of the 'baseline' value for align-items (and
-     align-self, implicitly), in a multi-line flex container.
+     align-self, implicitly), in a wrap-reverse multi-line flex container.
      This test baseline-aligns variously-sized flex items, and the container's
      vertical size depends on the aggregate post-alignment height of its items.
   -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>CSS Test: Baseline alignment of block flex items with 'baseline' value for 'align-items' / 'align-self' in a multi-line flex container</title>
     <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
     <link rel="help" href="http://www.w3.org/TR/css3-flexbox/#baseline-participation"/>
-    <link rel="match" href="flexbox-align-self-baseline-horiz-2-ref.xhtml"/>
+    <link rel="match" href="flexbox-align-self-baseline-horiz-3-ref.xhtml"/>
     <style>
       .flexbox {
         display: flex;
-        flex-wrap: wrap;
+        flex-wrap: wrap-reverse;
         align-items: baseline;
         width: 90px;
       }
 
       .flexbox > * {
         width: 28px; /* 3 items per Flex Line */
         background: yellow;
         border: 1px solid black;
--- a/layout/reftests/w3c-css/submitted/flexbox/reftest.list
+++ b/layout/reftests/w3c-css/submitted/flexbox/reftest.list
@@ -2,16 +2,17 @@
 == flexbox-align-content-horiz-1a.xhtml flexbox-align-content-horiz-1-ref.xhtml
 == flexbox-align-content-horiz-1b.xhtml flexbox-align-content-horiz-1-ref.xhtml
 == flexbox-align-content-vert-1a.xhtml  flexbox-align-content-vert-1-ref.xhtml
 == flexbox-align-content-vert-1b.xhtml  flexbox-align-content-vert-1-ref.xhtml
 
 # Tests for cross-axis alignment (align-self / align-items properties)
 == flexbox-align-self-baseline-horiz-1.xhtml flexbox-align-self-baseline-horiz-1-ref.xhtml
 == flexbox-align-self-baseline-horiz-2.xhtml flexbox-align-self-baseline-horiz-2-ref.xhtml
+== flexbox-align-self-baseline-horiz-3.xhtml flexbox-align-self-baseline-horiz-3-ref.xhtml
 
 == flexbox-align-self-stretch-vert-1.html flexbox-align-self-stretch-vert-1-ref.html
 
 == flexbox-align-self-horiz-1-block.xhtml  flexbox-align-self-horiz-1-ref.xhtml
 == flexbox-align-self-horiz-1-table.xhtml  flexbox-align-self-horiz-1-ref.xhtml
 == flexbox-align-self-horiz-2.xhtml  flexbox-align-self-horiz-2-ref.xhtml
 == flexbox-align-self-horiz-3.xhtml  flexbox-align-self-horiz-3-ref.xhtml
 == flexbox-align-self-horiz-4.xhtml  flexbox-align-self-horiz-4-ref.xhtml