| Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| index 6a5ef8dd3e0efa8398445c3fad36c36a0422aac8..7768591c61aa1216bb19366c38ac3102be76e134 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| @@ -1979,7 +1979,7 @@ static CSSValue* consumeCursor(CSSParserTokenRange& range, const CSSParserContex
|
| AtomicString uri(consumeUrl(range));
|
| if (!uri.isNull()) {
|
| image = createCSSImageValueWithReferrer(uri, context);
|
| - } else if (range.peek().type() == FunctionToken && range.peek().functionId() == CSSValueWebkitImageSet) {
|
| + } else if (range.peek().type() == FunctionToken && (range.peek().functionId() == CSSValueWebkitImageSet || range.peek().functionId() == CSSValueImageSet)) {
|
| image = consumeImageSet(range, context);
|
| if (!image)
|
| return nullptr;
|
| @@ -2432,7 +2432,7 @@ static CSSValue* consumeImage(CSSParserTokenRange& range, CSSParserContext conte
|
| return createCSSImageValueWithReferrer(uri, context);
|
| if (range.peek().type() == FunctionToken) {
|
| CSSValueID id = range.peek().functionId();
|
| - if (id == CSSValueWebkitImageSet)
|
| + if (id == CSSValueWebkitImageSet || id == CSSValueImageSet)
|
| return consumeImageSet(range, context);
|
| if (isGeneratedImage(id))
|
| return consumeGeneratedImage(range, context);
|
|
|