Index: Source/core/css/CSSProperty.cpp |
diff --git a/Source/core/css/CSSProperty.cpp b/Source/core/css/CSSProperty.cpp |
index cc5f926d0d93fa5229ddc890b5f4b013c16b1af3..cb80f201aaaa06328586e78f469a3f25f6c3f796 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 WebCore |