diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-27 21:51:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-05-27 21:51:42 +0200 |
| commit | be01689f43cf6882cf670d33df49ead1f570c53a (patch) | |
| tree | 4bb2161d8983b38e3e7ed37b4a50303bfd5e2e85 /Source/WebCore/css/StyleResolver.cpp | |
| parent | a89b2ebb8e192c5e8cea21079bda2ee2c0c7dddd (diff) | |
| download | qtwebkit-be01689f43cf6882cf670d33df49ead1f570c53a.tar.gz | |
Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629)
Diffstat (limited to 'Source/WebCore/css/StyleResolver.cpp')
| -rw-r--r-- | Source/WebCore/css/StyleResolver.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp index 07290a64e..06b41a8ac 100644 --- a/Source/WebCore/css/StyleResolver.cpp +++ b/Source/WebCore/css/StyleResolver.cpp @@ -1914,7 +1914,9 @@ static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s case BLOCK: case TABLE: case BOX: +#if ENABLE(CSS3_FLEXBOX) case FLEX: +#endif case GRID: return display; @@ -1927,8 +1929,10 @@ static EDisplay equivalentBlockDisplay(EDisplay display, bool isFloating, bool s return TABLE; case INLINE_BOX: return BOX; +#if ENABLE(CSS3_FLEXBOX) case INLINE_FLEX: return FLEX; +#endif case INLINE_GRID: return GRID; @@ -4105,6 +4109,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue *value) case CSSPropertyWebkitColumns: case CSSPropertyWebkitColumnSpan: case CSSPropertyWebkitColumnWidth: +#if ENABLE(CSS3_FLEXBOX) case CSSPropertyWebkitFlex: case CSSPropertyWebkitFlexAlign: case CSSPropertyWebkitFlexDirection: @@ -4114,6 +4119,7 @@ void StyleResolver::applyProperty(CSSPropertyID id, CSSValue *value) case CSSPropertyWebkitFlexOrder: case CSSPropertyWebkitFlexPack: case CSSPropertyWebkitFlexWrap: +#endif #if ENABLE(CSS_REGIONS) case CSSPropertyWebkitFlowFrom: case CSSPropertyWebkitFlowInto: |