Add CSS support for font-variation-settings

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
@@ skipping 1265 matching lines @@
     // See https://chromiumcodereview.appspot.com/19516002 for details.
     case CSSPropertyTextDecoration:
     case CSSPropertyTextShadow:
     case CSSPropertyBorderStyle:
       return true;
     case CSSPropertyTextDecorationLine:
     case CSSPropertyTextDecorationStyle:
     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;
   }
   return false;
 }
 
 static inline bool isValidFirstLetterStyleProperty(CSSPropertyID id) {
   switch (id) {
     // Valid ::first-letter properties listed in spec:
     // http://www.w3.org/TR/css3-selectors/#application-in-css
@@ skipping 82 matching lines @@
     case CSSPropertyWebkitMarginAfterCollapse:
     case CSSPropertyWebkitMarginBefore:
     case CSSPropertyWebkitMarginBeforeCollapse:
     case CSSPropertyWebkitMarginBottomCollapse:
     case CSSPropertyWebkitMarginCollapse:
     case CSSPropertyWebkitMarginEnd:
     case CSSPropertyWebkitMarginStart:
     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;
     case CSSPropertyTextDecorationColor:
     case CSSPropertyTextDecorationLine:
     case CSSPropertyTextDecorationStyle:
     case CSSPropertyTextDecorationSkip:
       DCHECK(RuntimeEnabledFeatures::css3TextDecorationsEnabled());
       return true;
 
     // text-shadow added in text decoration spec:
     // http://www.w3.org/TR/css-text-decor-3/#text-shadow-property
@@ skipping 567 matching lines @@
 DEFINE_TRACE(StyleResolver) {
   visitor->trace(m_matchedPropertiesCache);
   visitor->trace(m_selectorFilter);
   visitor->trace(m_styleSharingLists);
   visitor->trace(m_pendingStyleSheets);
   visitor->trace(m_document);
   visitor->trace(m_tracker);
 }
 
 }  // namespace blink