From be01689f43cf6882cf670d33df49ead1f570c53a Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Sun, 27 May 2012 21:51:42 +0200
Subject: Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6
 (http://svn.webkit.org/repository/webkit/trunk@118629)

---
 Source/WebCore/css/CSSComputedStyleDeclaration.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Source/WebCore/css/CSSComputedStyleDeclaration.cpp')

diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
index 52b41b726..596fa7cde 100644
--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -226,6 +226,7 @@ static const CSSPropertyID computedProperties[] = {
 #if ENABLE(CSS_FILTERS)
     CSSPropertyWebkitFilter,
 #endif
+#if ENABLE(CSS3_FLEXBOX)
     CSSPropertyWebkitFlex,
     CSSPropertyWebkitFlexOrder,
     CSSPropertyWebkitFlexPack,
@@ -235,6 +236,7 @@ static const CSSPropertyID computedProperties[] = {
     CSSPropertyWebkitFlexFlow,
     CSSPropertyWebkitFlexLinePack,
     CSSPropertyWebkitFlexWrap,
+#endif
     CSSPropertyWebkitFontKerning,
     CSSPropertyWebkitFontSmoothing,
     CSSPropertyWebkitFontVariantLigatures,
@@ -1627,6 +1629,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
             return cssValuePool().createValue(style->display());
         case CSSPropertyEmptyCells:
             return cssValuePool().createValue(style->emptyCells());
+#if ENABLE(CSS3_FLEXBOX)
         case CSSPropertyWebkitFlex: {
             RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
             list->append(cssValuePool().createValue(style->positiveFlex()));
@@ -1667,6 +1670,7 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(CSSPropert
             list->append(cssValuePool().createValue(style->flexWrap()));
             return list.release();
         }
+#endif
         case CSSPropertyFloat:
             return cssValuePool().createValue(style->floating());
         case CSSPropertyFont: {
-- 
cgit v1.2.1