| Index: third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
|
| index 267de532af62206e4160625e1694c8a17423c30b..373c3fa725967f75099080e22c2013151092ed47 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/LegacyCSSPropertyParser.cpp
|
| @@ -2125,7 +2125,7 @@ bool CSSPropertyParser::isValidNumericValue(double value)
|
| && value <= std::numeric_limits<float>::max();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseColor(const CSSParserValue* value, bool acceptQuirkyColors)
|
| +PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseColor(const CSSParserValue* value, bool acceptQuirkyColors)
|
| {
|
| CSSValueID id = value->id;
|
| if (isColorKeyword(id)) {
|
| @@ -4554,7 +4554,7 @@ PassRefPtrWillBeRawPtr<CSSValueList> CSSPropertyParser::parseShadow(CSSParserVal
|
| PassRefPtrWillBeRawPtr<CSSShadowValue> CSSPropertyParser::parseSingleShadow(CSSParserValueList* valueList, bool allowInset, bool allowSpread)
|
| {
|
| RefPtrWillBeMember<CSSPrimitiveValue> style;
|
| - RefPtrWillBeMember<CSSPrimitiveValue> color;
|
| + RefPtrWillBeMember<CSSValue> color;
|
| Vector<RefPtrWillBeRawPtr<CSSPrimitiveValue>, 4> lengths;
|
|
|
| CSSParserValue* val = valueList->current();
|
| @@ -4598,7 +4598,7 @@ PassRefPtrWillBeRawPtr<CSSShadowValue> CSSPropertyParser::parseSingleShadow(CSSP
|
| }
|
|
|
| if (val) {
|
| - if (RefPtrWillBeMember<CSSPrimitiveValue> colorValue = parseColor(val)) {
|
| + if (RefPtrWillBeMember<CSSValue> colorValue = parseColor(val)) {
|
| if (color)
|
| return nullptr;
|
| color = colorValue;
|
| @@ -5318,7 +5318,7 @@ static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseDeprecatedGradientPoint(CS
|
| }
|
|
|
| // Used to parse colors for -webkit-gradient(...).
|
| -PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseDeprecatedGradientStopColor(const CSSParserValue* value)
|
| +PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseDeprecatedGradientStopColor(const CSSParserValue* value)
|
| {
|
| // Disallow currentcolor.
|
| if (value->id == CSSValueCurrentcolor)
|
|
|