| Index: Source/core/css/CSSProperty.cpp
|
| diff --git a/Source/core/css/CSSProperty.cpp b/Source/core/css/CSSProperty.cpp
|
| index 501e7f56b2114b9a7e25476b298c36365b84dbd4..67689bb7e01261ba5945d3a6096f62ee802a7cc1 100644
|
| --- a/Source/core/css/CSSProperty.cpp
|
| +++ b/Source/core/css/CSSProperty.cpp
|
| @@ -685,16 +685,15 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
|
|
|
| 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;
|
| + return propertyID != CSSPropertyAll
|
| + && propertyID != CSSPropertyUnicodeBidi
|
| + && propertyID != CSSPropertyDirection
|
| + && propertyID != CSSPropertyInternalCallback
|
| + && !isExpandedShorthandForAll(propertyID);
|
| }
|
|
|
| } // namespace blink
|
|
|