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

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

Issue 1386733003: Do not accept CSS-wide keywords for descriptors (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: V7 Created 4 years, 7 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
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 565127705adba3e30bfe5e08269ffabb5055a199..e5c1698cc2e20acefedb86661f78d2cc340c43d8 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
@@ -305,10 +305,13 @@ bool CSSPropertyParser::consumeCSSWideKeyword(CSSPropertyID unresolvedProperty,
CSSPropertyID property = resolveCSSPropertyID(unresolvedProperty);
const StylePropertyShorthand& shorthand = shorthandForProperty(property);
- if (!shorthand.length())
+ if (!shorthand.length()) {
+ if (CSSPropertyMetadata::isDescriptor(property))
Timothy Loh 2016/05/19 05:44:42 I think it's better to be at the very top of parse
rwlbuis 2016/05/20 00:51:11 Same as before, done for efficiency, can move if y
+ return false;
addProperty(property, CSSPropertyInvalid, value, important);
- else
+ } else {
addExpandedPropertyForValue(property, value, important);
+ }
m_range = rangeCopy;
return true;
}

Powered by Google App Engine
This is Rietveld 408576698