diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebCore/css/CSSProperty.cpp | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebCore/css/CSSProperty.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSProperty.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index b3d056c56..1071bbef4 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -320,6 +320,7 @@ bool CSSProperty::isInheritedProperty(unsigned propertyID) case CSSPropertyWebkitFontFeatureSettings: case CSSPropertyWebkitFontKerning: case CSSPropertyWebkitFontSmoothing: + case CSSPropertyWebkitFontVariantLigatures: case CSSPropertyWebkitLocale: case CSSPropertyWebkitHighlight: case CSSPropertyWebkitHyphenateCharacter: @@ -559,6 +560,7 @@ bool CSSProperty::isInheritedProperty(unsigned propertyID) #endif case CSSPropertyWebkitFlexOrder: case CSSPropertyWebkitFlexPack: + case CSSPropertyWebkitFlexAlign: case CSSPropertyWebkitFlexItemAlign: case CSSPropertyWebkitFlexDirection: case CSSPropertyWebkitFlexFlow: |