| Index: Source/core/css/resolver/StyleResolver.cpp
|
| diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp
|
| index 3268bef9bfc9df1d7fa07db1e891e09913931a60..25373afd5454162b97af8bb6a2f7ffc39d2d53e9 100644
|
| --- a/Source/core/css/resolver/StyleResolver.cpp
|
| +++ b/Source/core/css/resolver/StyleResolver.cpp
|
| @@ -1253,7 +1253,7 @@ template<> CSSPropertyID StyleResolver::firstCSSPropertyId<StyleResolver::HighPr
|
| // This method returns the last CSSPropertyId of high priority properties.
|
| template<> CSSPropertyID StyleResolver::lastCSSPropertyId<StyleResolver::HighPriorityProperties>()
|
| {
|
| - COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyColor + 18, CSS_line_height_is_end_of_high_prioity_property_range);
|
| + COMPILE_ASSERT(CSSPropertyLineHeight == CSSPropertyColor + 17, CSS_line_height_is_end_of_high_prioity_property_range);
|
| COMPILE_ASSERT(CSSPropertyZoom == CSSPropertyLineHeight - 1, CSS_zoom_is_before_line_height);
|
| return CSSPropertyLineHeight;
|
| }
|
| @@ -1295,7 +1295,7 @@ void StyleResolver::applyAllProperty(StyleResolverState& state, CSSValue* allVal
|
| CSSPropertyID propertyId = static_cast<CSSPropertyID>(i);
|
|
|
| // StyleBuilder does not allow any expanded shorthands.
|
| - if (isExpandedShorthandForAll(propertyId))
|
| + if (isExpandedShorthand(propertyId))
|
| continue;
|
|
|
| // all shorthand spec says:
|
|
|