| Index: Source/core/css/resolver/StyleBuilderCustom.cpp
|
| diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| index 4594e7069ae5addbf3e61c03fecacf1aecbae8fd..04fdaee7be3d1816c7aa83bd935a37f04d8686d1 100644
|
| --- a/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| +++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| @@ -1295,18 +1295,6 @@ void StyleBuilder::oldApplyProperty(CSSPropertyID id, StyleResolverState& state,
|
| return;
|
| // Shorthand properties.
|
| case CSSPropertyFont:
|
| - // Only System Font identifiers should come through this method
|
| - // all other values should have been handled when the shorthand
|
| - // was expanded by the parser.
|
| - // FIXME: System Font identifiers should not hijack this
|
| - // short-hand CSSProperty like this.
|
| - ASSERT(!isInitial);
|
| - ASSERT(!isInherit);
|
| - ASSERT(primitiveValue);
|
| - state.style()->setLineHeight(RenderStyle::initialLineHeight());
|
| - state.setLineHeightValue(0);
|
| - state.fontBuilder().fromSystemFont(primitiveValue->getValueID(), state.style()->effectiveZoom());
|
| - return;
|
| case CSSPropertyAnimation:
|
| case CSSPropertyBackground:
|
| case CSSPropertyBackgroundPosition:
|
|
|