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

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp

Issue 2203773002: Add support for "image-set" Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | « third_party/WebKit/Source/core/css/CSSValueKeywords.in ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSValueKeywords.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698