Bug 797022: Turn on MOZ_FLEXBOX build flag to enable CSS3 flexbox in builds. r=bz
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 03 Oct 2012 19:08:43 -0700
changeset 109300 7ad0763694a36abd5ae6eee3d404fb60479989f8
parent 109299 5a7b8047348543b0197731431164edf49fd82ab3
child 109301 5fa8ef202444c7126daf9a8b30b79c6041530bed
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
reviewersbz
bugs797022
milestone18.0a1
Bug 797022: Turn on MOZ_FLEXBOX build flag to enable CSS3 flexbox in builds. r=bz
configure.in
dom/interfaces/css/nsIDOMCSS2Properties.idl
layout/reftests/reftest.list
--- a/configure.in
+++ b/configure.in
@@ -4201,17 +4201,17 @@ dnl ====================================
 
 MOZ_ARG_HEADER(Application)
 
 ENABLE_TESTS=1
 ENABLE_SYSTEM_EXTENSION_DIRS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_FEEDS=1
-MOZ_FLEXBOX=
+MOZ_FLEXBOX=1
 MOZ_WEBAPP_RUNTIME=
 MOZ_JSDEBUGGER=1
 MOZ_AUTH_EXTENSION=1
 MOZ_OGG=1
 MOZ_RAW=
 MOZ_SYDNEYAUDIO=
 MOZ_SPEEX_RESAMPLER=1
 MOZ_CUBEB=
--- a/dom/interfaces/css/nsIDOMCSS2Properties.idl
+++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl
@@ -9,17 +9,17 @@
  * The nsIDOMCSS2Properties interface is a datatype for additional
  * reflection of data already provided in nsIDOMCSSStyleDeclaration in
  * the Document Object Model.
  *
  * For more information on this interface please see
  * http://www.w3.org/TR/DOM-Level-2-Style
  */
 
-[builtinclass, scriptable, uuid(243898eb-0e13-416d-9a2e-33af084985ed)]
+[builtinclass, scriptable, uuid(2ae61565-1a66-4e6e-960d-b999c631e5c6)]
 interface nsIDOMCSS2Properties : nsISupports
 {
            attribute DOMString        background;
                                         // raises(DOMException) on setting
 
            attribute DOMString        backgroundAttachment;
                                         // raises(DOMException) on setting
 
@@ -798,20 +798,16 @@ interface nsIDOMCSS2Properties : nsISupp
                                         // raises(DOMException) on setting
 
            attribute DOMString        borderImageRepeat;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozBorderImage;
                                         // raises(DOMException) on setting
 
-/* XXXdholbert NOTE: Flexbox properties are commented out here, until our
-   layout engine responds to them.  In builds with MOZ_FLEXBOX enabled, this
-   block should be uncommented (and this interface's uuid should be revved).
-   (This would be #ifdef MOZ_FLEXBOX, if that worked in IDL files.)
            attribute DOMString        MozAlignItems;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozAlignSelf;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozFlex;
                                         // raises(DOMException) on setting
@@ -828,10 +824,9 @@ interface nsIDOMCSS2Properties : nsISupp
            attribute DOMString        MozFlexShrink;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozOrder;
                                         // raises(DOMException) on setting
 
            attribute DOMString        MozJustifyContent;
                                         // raises(DOMException) on setting
-*/
 };
--- a/layout/reftests/reftest.list
+++ b/layout/reftests/reftest.list
@@ -137,18 +137,17 @@ include generated-content/reftest.list
 
 # first-letter/
 skip-if(Android||B2G) include first-letter/reftest.list
 
 # first-line/
 include first-line/reftest.list
 
 # flexbox (display: flex, display: inline-flex)
-# XXXdholbert Uncomment if MOZ_FLEXBOX is enabled:
-# include flexbox/reftest.list
+include flexbox/reftest.list
 
 # floats/
 include floats/reftest.list
 
 # font-face
 include font-face/reftest.list
 
 # font features (opentype)