| Index: third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| diff --git a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| index c12d010ef8d7b38f8076349b77db36ec3e03b423..19c508477afb42b87a09ffc61339b8159caf408b 100644
|
| --- a/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| +++ b/third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "core/animation/ColorPropertyFunctions.h"
|
| #include "core/css/CSSColorValue.h"
|
| -#include "core/css/parser/CSSPropertyParser.h"
|
| #include "core/css/resolver/StyleResolverState.h"
|
| #include "core/layout/LayoutTheme.h"
|
|
|
| @@ -61,7 +60,7 @@ PassOwnPtr<InterpolableValue> CSSColorInterpolationType::createInterpolableColor
|
| case CSSValueWebkitFocusRingColor:
|
| return createInterpolableColor(LayoutTheme::theme().focusRingColor());
|
| default:
|
| - ASSERT(CSSPropertyParser::isColorKeyword(keyword));
|
| + DCHECK(StyleColor::isColorKeyword(keyword));
|
| return createInterpolableColor(StyleColor::colorFromKeyword(keyword));
|
| }
|
| }
|
| @@ -82,7 +81,7 @@ PassOwnPtr<InterpolableValue> CSSColorInterpolationType::maybeCreateInterpolable
|
| const CSSPrimitiveValue& primitive = toCSSPrimitiveValue(value);
|
| if (!primitive.isValueID())
|
| return nullptr;
|
| - if (!CSSPropertyParser::isColorKeyword(primitive.getValueID()))
|
| + if (!StyleColor::isColorKeyword(primitive.getValueID()))
|
| return nullptr;
|
| return createInterpolableColor(primitive.getValueID());
|
| }
|
|
|