| Index: Source/core/css/CSSProperty.cpp
|
| diff --git a/Source/core/css/CSSProperty.cpp b/Source/core/css/CSSProperty.cpp
|
| index 3d3459eb8244bafefc8bda51160a2980a9b229e8..557bd315c74b89308584e4cb225a186128523ce2 100644
|
| --- a/Source/core/css/CSSProperty.cpp
|
| +++ b/Source/core/css/CSSProperty.cpp
|
| @@ -674,6 +674,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
|
| case CSSPropertyUserZoom:
|
| case CSSPropertyZIndex:
|
| case CSSPropertyZoom:
|
| + case CSSPropertyAll:
|
| return false;
|
| case CSSPropertyInvalid:
|
| ASSERT_NOT_REACHED();
|
| @@ -683,4 +684,18 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
|
| return false;
|
| }
|
|
|
| +bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID)
|
| +{
|
| + if (propertyID == CSSPropertyAll)
|
| + return false;
|
| +
|
| + // all shorthand spec says:
|
| + // The all property is a shorthand that resets all CSS properties except
|
| + // direction and unicode-bidi. It only accepts the CSS-wide keywords.
|
| + // c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
|
| + // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not
|
| + // affected by all property.
|
| + return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDirection;
|
| +}
|
| +
|
| } // namespace WebCore
|
|
|