Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Unified Diff: third_party/WebKit/Source/core/animation/CSSColorInterpolationType.cpp

Issue 2041363002: Move isColorKeyword out of CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Alternative using StyleColor Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/StyleColor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
}
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/StyleColor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698