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

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2558053002: Add CSS support for font-variation-settings (Closed)
Patch Set: Addressing Tim's review comments, adjusting test expectations Created 4 years 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/resolver/StyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index 77476654eb6539630a8f07256cb0ae05ba2ed03b..d629eb473dec51269dbdfd8655786ee106dd2679 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -1282,7 +1282,11 @@ static inline bool isValidCueStyleProperty(CSSPropertyID id) {
case CSSPropertyTextDecorationStyle:
case CSSPropertyTextDecorationColor:
case CSSPropertyTextDecorationSkip:
- return RuntimeEnabledFeatures::css3TextDecorationsEnabled();
+ DCHECK(RuntimeEnabledFeatures::css3TextDecorationsEnabled());
+ return true;
+ case CSSPropertyFontVariationSettings:
+ DCHECK(RuntimeEnabledFeatures::cssVariableFontsEnabled());
+ return true;
default:
break;
}
@@ -1385,8 +1389,11 @@ static inline bool isValidFirstLetterStyleProperty(CSSPropertyID id) {
case CSSPropertyWebkitMarginTopCollapse:
case CSSPropertyWordSpacing:
return true;
+ case CSSPropertyFontVariationSettings:
+ DCHECK(RuntimeEnabledFeatures::cssVariableFontsEnabled());
+ return true;
case CSSPropertyTextDecoration:
- DCHECK(!RuntimeEnabledFeatures::css3TextDecorationsEnabled());
+ DCHECK(RuntimeEnabledFeatures::css3TextDecorationsEnabled());
return true;
case CSSPropertyTextDecorationColor:
case CSSPropertyTextDecorationLine:

Powered by Google App Engine
This is Rietveld 408576698