[GTK] Add --enable-css3-flexbox configure option after r118304.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 May 2012 04:00:42 +0000 (04:00 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 May 2012 04:00:42 +0000 (04:00 +0000)
https://bugs.webkit.org/show_bug.cgi?id=87455

Patch by Philippe Normand <pnormand@igalia.com> on 2012-05-24
Reviewed by Xan Lopez.

.:

* configure.ac:

Source/WebCore:

* GNUmakefile.am:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@118470 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
configure.ac

index 373d7c9..10926ce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-24  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] Add --enable-css3-flexbox configure option after r118304.
+        https://bugs.webkit.org/show_bug.cgi?id=87455
+
+        Reviewed by Xan Lopez.
+
+        * configure.ac:
+
 2012-05-24  John Mellor  <johnme@chromium.org>
 
         Font Boosting: Add compile flag and runtime setting
index 38db914..b53f229 100644 (file)
@@ -1,3 +1,12 @@
+2012-05-24  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] Add --enable-css3-flexbox configure option after r118304.
+        https://bugs.webkit.org/show_bug.cgi?id=87455
+
+        Reviewed by Xan Lopez.
+
+        * GNUmakefile.am:
+
 2012-05-24  MORITA Hajime  <morrita@google.com>
 
         Scoped stylesheet should be per-document-configurable.
index 674f746..9775f24 100644 (file)
@@ -671,6 +671,14 @@ FEATURE_DEFINES += ENABLE_IFRAME_SEAMLESS=1
 webcore_cppflags += -DENABLE_IFRAME_SEAMLESS=1
 endif  # END ENABLE_IFRAME_SEAMLESS
 
+# ---
+# CSS3 Flexbox support
+# ---
+if ENABLE_CSS3_FLEXBOX
+FEATURE_DEFINES += ENABLE_CSS3_FLEXBOX=1
+webcore_cppflags += -DENABLE_CSS3_FLEXBOX=1
+endif  # END ENABLE_CSS3_FLEXBOX
+
 DerivedSources/WebCore/CSSPropertyNames.cpp: DerivedSources/WebCore/CSSPropertyNames.h
 DerivedSources/WebCore/CSSPropertyNames.h: $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/makeprop.pl
        $(AM_V_GEN)
index a800a27..5caa091 100644 (file)
@@ -976,6 +976,14 @@ AC_ARG_ENABLE(coverage,
               [],[enable_coverage="no"])
 AC_MSG_RESULT([$enable_coverage])
 
+# check whether to enable CSS flaxbox support
+AC_MSG_CHECKING([whether to enable CSS3 flexbox support])
+AC_ARG_ENABLE(css3_flexbox,
+              AC_HELP_STRING([--enable-css3-flexbox],
+                             [enable CSS3 flexbox support [default=no]]),
+              [],[enable_css3_flexbox="no"])
+AC_MSG_RESULT([$enable_css3_flexbox])
+
 # check whether to enable FastMalloc
 AC_MSG_CHECKING([whether to enable optimized memory allocator])
 AC_ARG_ENABLE(fast_malloc,
@@ -1395,6 +1403,7 @@ AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" =
 AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
 AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
+AM_CONDITIONAL([ENABLE_CSS3_FLEXBOX],[test "$enable_css3_flexbox" = "yes"])
 AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
 AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
 AM_CONDITIONAL([ENABLE_SHADOW_DOM],[test "$enable_shadow_dom" = "yes"])
@@ -1465,6 +1474,7 @@ Build configuration:
 Features:
  WebGL                                                    : $enable_webgl
  Blob support                                             : $enable_blob
+ CSS3 Flexbox support                                     : $enable_css3_flexbox
  Legacy WebKitBlobBuilder support                         : $enable_legacy_webkit_blob_builder
  DOM mutation observer support                            : $enable_mutation_observers
  DeviceOrientation support                                : $enable_device_orientation