| Index: Source/core/css/resolver/StyleBuilderCustom.cpp
|
| diff --git a/Source/core/css/resolver/StyleBuilderCustom.cpp b/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| index 4f5c7ba05b117162f8c022ceb132ec176e2b3053..105bd34f22734c110d9ad62f5f6fbe1d2275172f 100644
|
| --- a/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| +++ b/Source/core/css/resolver/StyleBuilderCustom.cpp
|
| @@ -53,7 +53,7 @@
|
| #include "core/css/CSSLineBoxContainValue.h"
|
| #include "core/css/parser/BisonCSSParser.h"
|
| #include "core/css/CSSPrimitiveValueMappings.h"
|
| -#include "core/css/CSSProperty.h"
|
| +#include "core/css/CSSPropertyMetadata.h"
|
| #include "core/css/Counter.h"
|
| #include "core/css/Pair.h"
|
| #include "core/css/Rect.h"
|
| @@ -125,7 +125,7 @@ void StyleBuilder::applyProperty(CSSPropertyID id, StyleResolverState& state, CS
|
| if (primitiveValue && primitiveValue->getValueID() == CSSValueCurrentcolor)
|
| state.style()->setHasCurrentColor();
|
|
|
| - if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSProperty::isInheritedProperty(id))
|
| + if (isInherit && !state.parentStyle()->hasExplicitlyInheritedProperties() && !CSSPropertyMetadata::isInheritedProperty(id))
|
| state.parentStyle()->setHasExplicitlyInheritedProperties();
|
|
|
| StyleBuilder::applyProperty(id, state, value, isInitial, isInherit);
|
|
|