From be01689f43cf6882cf670d33df49ead1f570c53a Mon Sep 17 00:00:00 2001 From: Simon Hausmann 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/CSSProperty.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/WebCore/css/CSSProperty.cpp') diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index fc76a5e7a..319b02614 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -537,6 +537,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) #if ENABLE(CSS_FILTERS) case CSSPropertyWebkitFilter: #endif +#if ENABLE(CSS3_FLEXBOX) case CSSPropertyWebkitFlex: case CSSPropertyWebkitFlexOrder: case CSSPropertyWebkitFlexPack: @@ -546,6 +547,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) case CSSPropertyWebkitFlexFlow: case CSSPropertyWebkitFlexLinePack: case CSSPropertyWebkitFlexWrap: +#endif case CSSPropertyWebkitFontSizeDelta: case CSSPropertyWebkitGridColumns: case CSSPropertyWebkitGridRows: -- cgit v1.2.1