From 622f456be430e63e057556a7a8e6406c4437d595 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Wed, 3 Oct 2012 19:08:43 -0700 Subject: [PATCH] Bug 797022: Turn on MOZ_FLEXBOX build flag to enable CSS3 flexbox in builds. r=bz --- configure.in | 2 +- dom/interfaces/css/nsIDOMCSS2Properties.idl | 7 +------ layout/reftests/reftest.list | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index fa6f6b01c9f..18dea6f86e1 100644 --- a/configure.in +++ b/configure.in @@ -4206,7 +4206,7 @@ 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 diff --git a/dom/interfaces/css/nsIDOMCSS2Properties.idl b/dom/interfaces/css/nsIDOMCSS2Properties.idl index 6faf09bfb0a..d36cdce3d2e 100644 --- a/dom/interfaces/css/nsIDOMCSS2Properties.idl +++ b/dom/interfaces/css/nsIDOMCSS2Properties.idl @@ -14,7 +14,7 @@ * 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; @@ -803,10 +803,6 @@ interface nsIDOMCSS2Properties : nsISupports 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 @@ -833,5 +829,4 @@ interface nsIDOMCSS2Properties : nsISupports attribute DOMString MozJustifyContent; // raises(DOMException) on setting -*/ }; diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list index ea9b4e47efd..3e15da3fbb1 100644 --- a/layout/reftests/reftest.list +++ b/layout/reftests/reftest.list @@ -142,8 +142,7 @@ skip-if(Android||B2G) include first-letter/reftest.list 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