diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebCore/css/CSSProperty.cpp | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
| download | qtwebkit-470286ecfe79d59df14944e5b5d34630fc739391.tar.gz | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebCore/css/CSSProperty.cpp')
| -rw-r--r-- | Source/WebCore/css/CSSProperty.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp index 79be67b46..6128a1097 100644 --- a/Source/WebCore/css/CSSProperty.cpp +++ b/Source/WebCore/css/CSSProperty.cpp @@ -327,6 +327,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) case CSSPropertyWebkitTextCombine: #if ENABLE(CSS3_TEXT) case CSSPropertyWebkitTextDecorationLine: + case CSSPropertyWebkitTextAlignLast: #endif // CSS3_TEXT case CSSPropertyWebkitTextDecorationsInEffect: case CSSPropertyWebkitTextEmphasis: @@ -651,8 +652,8 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID) #if ENABLE(CSS_EXCLUSIONS) case CSSPropertyWebkitWrap: case CSSPropertyWebkitWrapFlow: - case CSSPropertyWebkitWrapMargin: - case CSSPropertyWebkitWrapPadding: + case CSSPropertyWebkitShapeMargin: + case CSSPropertyWebkitShapePadding: case CSSPropertyWebkitShapeInside: case CSSPropertyWebkitShapeOutside: case CSSPropertyWebkitWrapThrough: |