diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 22:05:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 22:05:29 +0200 |
| commit | 0bb233d1f7c4317bb772d72cc3f92cbcdb4027de (patch) | |
| tree | 47b40aab26fdaa15ec446b7d6de9bdf7efd7bbbb /Source/WebCore/css/CSSProperty.cpp | |
| parent | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (diff) | |
| download | qtwebkit-0bb233d1f7c4317bb772d72cc3f92cbcdb4027de.tar.gz | |
Imported WebKit commit f2da9451cbccb8b7921d55483aa0bc656ff9cf53 (http://svn.webkit.org/repository/webkit/trunk@119269)
New snapshot that includes fix for using -Werror only in developer builds
Diffstat (limited to 'Source/WebCore/css/CSSProperty.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSProperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index 29eb85033..a392cfacd 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -542,7 +542,6 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) case CSSPropertyWebkitAlignItems: case CSSPropertyWebkitAlignSelf: case CSSPropertyWebkitFlex: - case CSSPropertyWebkitFlexOrder: case CSSPropertyWebkitFlexPack: case CSSPropertyWebkitFlexDirection: case CSSPropertyWebkitFlexFlow: @@ -596,6 +595,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) case CSSPropertyWebkitMaxLogicalHeight: case CSSPropertyWebkitMinLogicalWidth: case CSSPropertyWebkitMinLogicalHeight: + case CSSPropertyWebkitOrder: case CSSPropertyWebkitPaddingAfter: case CSSPropertyWebkitPaddingBefore: case CSSPropertyWebkitPaddingEnd: |