| Index: third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| index 845a3f092c3c62ef4647eb9c56f39931f049ea20..3e6d595f16a00cd870f3b561539feee56b9a7102 100644
|
| --- a/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| @@ -116,7 +116,7 @@ void StyleBuilder::applyProperty(CSSPropertyID id, StyleResolverState& state, CS
|
| return;
|
| }
|
|
|
| - ASSERT_WITH_MESSAGE(!isShorthandProperty(id), "Shorthand property id = %d wasn't expanded at parsing time", id);
|
| + DCHECK(!isShorthandProperty(id)) << "Shorthand property id = " << id << " wasn't expanded at parsing time";
|
|
|
| bool isInherit = state.parentNode() && value->isInheritedValue();
|
| bool isInitial = value->isInitialValue() || (!state.parentNode() && value->isInheritedValue());
|
|
|