Add CSS support for font-variation-settings

third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp

 /*
  * Copyright (C) 2004 Zack Rusin <zack@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2011 Sencha, Inc. All rights reserved.
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 21 matching lines @@
 #include "core/css/CSSBasicShapeValues.h"
 #include "core/css/CSSBorderImage.h"
 #include "core/css/CSSBorderImageSliceValue.h"
 #include "core/css/CSSColorValue.h"
 #include "core/css/CSSCounterValue.h"
 #include "core/css/CSSCursorImageValue.h"
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSCustomPropertyDeclaration.h"
 #include "core/css/CSSFontFamilyValue.h"
 #include "core/css/CSSFontFeatureValue.h"
+#include "core/css/CSSFontVariationValue.h"
 #include "core/css/CSSFunctionValue.h"
 #include "core/css/CSSGridLineNamesValue.h"
 #include "core/css/CSSGridTemplateAreasValue.h"
 #include "core/css/CSSIdentifierValue.h"
 #include "core/css/CSSInitialValue.h"
 #include "core/css/CSSPathValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSPrimitiveValueMappings.h"
 #include "core/css/CSSQuadValue.h"
 #include "core/css/CSSReflectValue.h"
@@ skipping 2304 matching lines @@
         return CSSIdentifierValue::create(CSSValueNormal);
       CSSValueList* list = CSSValueList::createCommaSeparated();
       for (unsigned i = 0; i < featureSettings->size(); ++i) {
         const FontFeature& feature = featureSettings->at(i);
         CSSFontFeatureValue* featureValue =
             CSSFontFeatureValue::create(feature.tag(), feature.value());
         list->append(*featureValue);
       }
       return list;
     }
+    case CSSPropertyFontVariationSettings: {
+      if (RuntimeEnabledFeatures::cssVariableFontsEnabled()) {

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

I think this can be a DCHECK? Otherwise it's weird because we'd fall-through to
the next case if it's not enabled.

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

Changed to DCHECK.

+        const FontVariationSettings* variationSettings =
+            style.getFontDescription().variationSettings();
+        if (!variationSettings || !variationSettings->size())
+          return CSSIdentifierValue::create(CSSValueNormal);
+        CSSValueList* list = CSSValueList::createCommaSeparated();
+        for (unsigned i = 0; i < variationSettings->size(); ++i) {
+          const FontVariationAxis& variationAxis = variationSettings->at(i);
+          CSSFontVariationValue* variationValue = CSSFontVariationValue::create(
+              variationAxis.tag(), variationAxis.value());
+          list->append(*variationValue);
+        }
+        return list;
+      }
+    }
     case CSSPropertyGridAutoFlow: {
       CSSValueList* list = CSSValueList::createSpaceSeparated();
       switch (style.getGridAutoFlow()) {
         case AutoFlowRow:
         case AutoFlowRowDense:
           list->append(*CSSIdentifierValue::create(CSSValueRow));
           break;
         case AutoFlowColumn:
         case AutoFlowColumnDense:
           list->append(*CSSIdentifierValue::create(CSSValueColumn));
@@ skipping 1252 matching lines @@
     case CSSPropertyAll:
       return nullptr;
     default:
       break;
   }
   ASSERT_NOT_REACHED();
   return nullptr;
 }
 
 }  // namespace blink