Bug 799647 part 2: reftest. r=dbaron
authorDaniel Holbert <dholbert@cs.stanford.edu>
Thu, 11 Oct 2012 18:41:32 -0700
changeset 110167 5c4301b89fcfa6c048213f86058d75791875fd81
parent 110166 d2f750a7533a38ad9e3c2859e589d01cfeb36966
child 110168 022c39b4aae636985e60e2ebe34494dfe87c705d
child 110170 ea7bf4553d66eb343c0f6e9a7cc071d1eb54c40c
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersdbaron
bugs799647
milestone19.0a1
Bug 799647 part 2: reftest. r=dbaron
layout/reftests/flexbox/flexbox-align-self-horiz-1-block.xhtml
layout/reftests/flexbox/flexbox-align-self-horiz-1-table.xhtml
layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml
layout/reftests/flexbox/reftest.list
rename from layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml
rename to layout/reftests/flexbox/flexbox-align-self-horiz-1-block.xhtml
copy from layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml
copy to layout/reftests/flexbox/flexbox-align-self-horiz-1-table.xhtml
--- a/layout/reftests/flexbox/flexbox-align-self-horiz-1.xhtml
+++ b/layout/reftests/flexbox/flexbox-align-self-horiz-1-table.xhtml
@@ -20,17 +20,18 @@
            -moz-initial) will end up taking this value from us: */
         -moz-align-items: center;
 
         /* Any children whose align-self is 'inherit' will end up
            inheriting this value from us: */
         -moz-align-self: flex-end;
       }
 
-      .flexbox > div {
+      .flexbox > * {
+        display: table;
         width: 40px;
       }
 
       .big {
         height: 100px;
         font-size: 20px;
         line-height: 20px;
       }
@@ -50,16 +51,17 @@
       }
       .baseline {
         background: teal;
         -moz-align-self: baseline;
       }
       .stretch {
         background: pink;
         -moz-align-self: stretch;
+        display: block; /* XXXdholbert Hackaround for bug 799725 */
       }
       .auto {
         background: yellow;
         -moz-align-self: auto;
       }
       .unspecified {
         background: lightgreen;
       }
--- a/layout/reftests/flexbox/reftest.list
+++ b/layout/reftests/flexbox/reftest.list
@@ -10,17 +10,21 @@ fails test-pref(layout.css.flexbox.enabl
 # This one fails on windows R (but not Ru, strangely). On Windows R, the
 # single-line <label> flex item has a different background size in test vs. ref
 random-if(winWidget) test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-baseline-horiz-3.xhtml  flexbox-align-self-baseline-horiz-3-ref.xhtml # XXXdholbert investigate
 # XXXdholbert This test needs the flexbox pref to be enabled _at startup time_
 # (when we parse ua.css) in order to pass -- so it'll fail until we enable the
 # flexbox pref by default (bug 783409):
 fails == flexbox-align-self-baseline-horiz-4.xhtml flexbox-align-self-baseline-horiz-4-ref.xhtml
 
-test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-horiz-1.xhtml  flexbox-align-self-horiz-1-ref.xhtml
+test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-horiz-1-block.xhtml  flexbox-align-self-horiz-1-ref.xhtml
+# XXXdholbert This test needs the flexbox pref to be enabled _at startup time_
+# (when we parse ua.css) in order to pass -- so it'll fail until we enable the
+# flexbox pref by default (bug 783409):
+fails == flexbox-align-self-horiz-1-table.xhtml  flexbox-align-self-horiz-1-ref.xhtml
 test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-horiz-2.xhtml  flexbox-align-self-horiz-2-ref.xhtml
 test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-horiz-3.xhtml  flexbox-align-self-horiz-3-ref.xhtml
 test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-horiz-4.xhtml  flexbox-align-self-horiz-4-ref.xhtml
 pref(layout.css.flexbox.enabled,true) == flexbox-align-self-horiz-5.xhtml  flexbox-align-self-horiz-5-ref.xhtml
 test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-vert-1.xhtml  flexbox-align-self-vert-1-ref.xhtml
 test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-vert-2.xhtml  flexbox-align-self-vert-2-ref.xhtml
 test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-vert-3.xhtml  flexbox-align-self-vert-3-ref.xhtml
 test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-vert-4.xhtml  flexbox-align-self-vert-4-ref.xhtml