Chromium Code Reviews| Index: third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp |
| diff --git a/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp b/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp |
| index 4c79bcb8fad539034f51a033e088159a5f897b27..25bed9b27e81c963c9ddc753d426926316b02096 100644 |
| --- a/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp |
| +++ b/third_party/WebKit/Source/core/animation/AnimationInputHelpers.cpp |
| @@ -31,15 +31,19 @@ static String removeSVGPrefix(const String& property) |
| CSSPropertyID AnimationInputHelpers::keyframeAttributeToCSSProperty(const String& property, const Document& document) |
| { |
| - // Disallow prefixed properties. |
| - if (property[0] == '-' || isASCIIUpper(property[0])) |
| + // Disallow hyphenated and prefixed properties. |
| + if (property.find('-') != kNotFound) { |
|
alancutter (OOO until 2018)
2016/03/10 01:26:50
Does this logic need to move? This seems more expe
Eric Willigers
2016/03/10 01:56:04
Moved back.
|
| + if (cssPropertyID(property) != CSSPropertyInvalid) |
| + Deprecation::countDeprecation(document, UseCounter::WebAnimationHyphenatedProperty); |
| + return CSSPropertyInvalid; |
| + } |
| + if (isASCIIUpper(property[0])) |
| return CSSPropertyInvalid; |
| if (property == "cssFloat") |
| return CSSPropertyFloat; |
| + |
| StringBuilder builder; |
| for (size_t i = 0; i < property.length(); ++i) { |
| - if (property[i] == '-') |
| - Deprecation::countDeprecation(document, UseCounter::WebAnimationHyphenatedProperty); |
| if (isASCIIUpper(property[i])) |
| builder.append('-'); |
| builder.append(property[i]); |