From c32749caf33ed32b9160557108c2e76b7f8ac84d Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Wed, 3 Oct 2012 18:45:06 -0700 Subject: [PATCH] Bug 797601 part 3: Add a reftest to verify that the flexbox about:config pref works, and annotate the other flexbox reftests to turn on the pref for them. r=bz --- .../flexbox/flexbox-pref-1-disabled-ref.xhtml | 22 ++ .../flexbox/flexbox-pref-1-enabled-ref.xhtml | 22 ++ layout/reftests/flexbox/flexbox-pref-1.xhtml | 40 +++ layout/reftests/flexbox/reftest.list | 242 +++++++++--------- 4 files changed, 208 insertions(+), 118 deletions(-) create mode 100644 layout/reftests/flexbox/flexbox-pref-1-disabled-ref.xhtml create mode 100644 layout/reftests/flexbox/flexbox-pref-1-enabled-ref.xhtml create mode 100644 layout/reftests/flexbox/flexbox-pref-1.xhtml diff --git a/layout/reftests/flexbox/flexbox-pref-1-disabled-ref.xhtml b/layout/reftests/flexbox/flexbox-pref-1-disabled-ref.xhtml new file mode 100644 index 000000000000..55743d4d19af --- /dev/null +++ b/layout/reftests/flexbox/flexbox-pref-1-disabled-ref.xhtml @@ -0,0 +1,22 @@ + + + + + + + +

+ "display: -moz-flex" is: +

disabled
+

+

+ "display: -moz-inline-flex" is: +

disabled
+

+ + diff --git a/layout/reftests/flexbox/flexbox-pref-1-enabled-ref.xhtml b/layout/reftests/flexbox/flexbox-pref-1-enabled-ref.xhtml new file mode 100644 index 000000000000..aac481ff7848 --- /dev/null +++ b/layout/reftests/flexbox/flexbox-pref-1-enabled-ref.xhtml @@ -0,0 +1,22 @@ + + + + + + + +

+ "display: -moz-flex" is: +

enabled
+

+

+ "display: -moz-inline-flex" is: +

enabled
+

+ + diff --git a/layout/reftests/flexbox/flexbox-pref-1.xhtml b/layout/reftests/flexbox/flexbox-pref-1.xhtml new file mode 100644 index 000000000000..ac2b3e869600 --- /dev/null +++ b/layout/reftests/flexbox/flexbox-pref-1.xhtml @@ -0,0 +1,40 @@ + + + + + + + + +

+ "display: -moz-flex" is: + +

enabled
+
disabled
+

+

+ "display: -moz-inline-flex" is:
+ +

enabled
+
disabled
+

+ + diff --git a/layout/reftests/flexbox/reftest.list b/layout/reftests/flexbox/reftest.list index acfafb2705bf..2246a59d5fe0 100644 --- a/layout/reftests/flexbox/reftest.list +++ b/layout/reftests/flexbox/reftest.list @@ -1,162 +1,168 @@ +# Tests for flexbox pref "layout.css.flexbox.enabled" +# (Note that it defaults to off for now) +== flexbox-pref-1.xhtml flexbox-pref-1-disabled-ref.xhtml +test-pref(layout.css.flexbox.enabled,false) == flexbox-pref-1.xhtml flexbox-pref-1-disabled-ref.xhtml +test-pref(layout.css.flexbox.enabled,true) == flexbox-pref-1.xhtml flexbox-pref-1-enabled-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 -fails == flexbox-align-self-baseline-horiz-2.xhtml flexbox-align-self-baseline-horiz-2-ref.xhtml # bug 793456, and possibly others +test-pref(layout.css.flexbox.enabled,true) == flexbox-align-self-baseline-horiz-1.xhtml flexbox-align-self-baseline-horiz-1-ref.xhtml +fails test-pref(layout.css.flexbox.enabled,true) == 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). On Windows R, the # single-line