Add CSS support for font-variation-settings

third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

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..9b5da0e5921a6a873f6e3f70bae37e6e7280ce8a 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -1283,6 +1283,8 @@ static inline bool isValidCueStyleProperty(CSSPropertyID id) {
     case CSSPropertyTextDecorationColor:
     case CSSPropertyTextDecorationSkip:
       return RuntimeEnabledFeatures::css3TextDecorationsEnabled();
+    case CSSPropertyFontVariationSettings:
+      return RuntimeEnabledFeatures::cssVariableFontsEnabled();

[Timothy Loh, 2016/12/08 03:36:05]

It looks like this (and the text-deco props) should just return true and DCHECK
the flag, but I'm not sure.

[drott, 2016/12/09 10:25:50]

Makes sense to me, changed, and corrected the inverted logic of the DCHECK
below.

     default:
       break;
   }
@@ -1385,6 +1387,9 @@ static inline bool isValidFirstLetterStyleProperty(CSSPropertyID id) {
     case CSSPropertyWebkitMarginTopCollapse:
     case CSSPropertyWordSpacing:
       return true;
+    case CSSPropertyFontVariationSettings:
+      DCHECK(!RuntimeEnabledFeatures::cssVariableFontsEnabled());
+      return true;
     case CSSPropertyTextDecoration:
       DCHECK(!RuntimeEnabledFeatures::css3TextDecorationsEnabled());

[Timothy Loh, 2016/12/12 02:15:38]

This one is correct -- when the flag is off we treat text-decoration as a
property but when it's on we treat it as a shorthand (so we should only have the
longhand values when we get here).

       return true;