Implement font-variant-numeric

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/resolver/FontBuilder.h"
 
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/Document.h"
 #include "core/dom/StyleEngine.h"
 #include "core/frame/Settings.h"
@@ skipping 97 matching lines @@
 
 static void fontStyleBase(FontDescription& d) { d.setStyle(FontStyleItalic); }
 static void fontStyleValue(FontBuilder& b) { b.setStyle(FontStyleNormal); }
 
 static void fontVariantCapsBase(FontDescription& d) { d.setVariantCaps(FontDescription::SmallCaps); }
 static void fontVariantCapsValue(FontBuilder& b) { b.setVariantCaps(FontDescription::CapsNormal); }
 
 static void fontVariantLigaturesBase(FontDescription& d) { d.setVariantLigatures(FontDescription::VariantLigatures(FontDescription::EnabledLigaturesState)); }
 static void fontVariantLigaturesValue(FontBuilder& b) { b.setVariantLigatures(FontDescription::VariantLigatures(FontDescription::DisabledLigaturesState)); }
 
+static void fontVariantNumericBase(FontDescription &d) { d.setVariantNumeric(FontVariantNumeric()); }

[Timothy Loh, 2016/05/10 05:26:25]

& before the space

[drott, 2016/05/10 10:59:06]

Done.

+static void fontVariantNumericValue(FontBuilder& b)
+{
+    FontVariantNumeric variantNumeric;
+    variantNumeric.setNumericFraction(FontVariantNumeric::StackedFractions);
+    b.setVariantNumeric(variantNumeric);
+}
+
 static void fontTextRenderingBase(FontDescription& d) { d.setTextRendering(GeometricPrecision); }
 static void fontTextRenderingValue(FontBuilder& b) { b.setTextRendering(OptimizeLegibility); }
 
 static void fontKerningBase(FontDescription& d) { d.setKerning(FontDescription::NormalKerning); }
 static void fontKerningValue(FontBuilder& b) { b.setKerning(FontDescription::NoneKerning); }
 
 static void fontFontSmoothingBase(FontDescription& d) { d.setFontSmoothing(Antialiased); }
 static void fontFontSmoothingValue(FontBuilder& b) { b.setFontSmoothing(SubpixelAntialiased); }
 
 static void fontSizeBase(FontDescription& d)
@@ skipping 18 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(AllFields, FontBuilderAdditiveTest,
     ::testing::Values(FunctionPair(fontWeightBase, fontWeightValue),
     FunctionPair(fontStretchBase, fontStretchValue),
     FunctionPair(fontFamilyBase, fontFamilyValue),
     FunctionPair(fontFeatureSettingsBase, fontFeatureSettingsValue),
     FunctionPair(fontStyleBase, fontStyleValue),
     FunctionPair(fontVariantCapsBase, fontVariantCapsValue),
     FunctionPair(fontVariantLigaturesBase, fontVariantLigaturesValue),
+    FunctionPair(fontVariantNumericBase, fontVariantNumericValue),
     FunctionPair(fontTextRenderingBase, fontTextRenderingValue),
     FunctionPair(fontKerningBase, fontKerningValue),
     FunctionPair(fontFontSmoothingBase, fontFontSmoothingValue),
     FunctionPair(fontSizeBase, fontSizeValue),
     FunctionPair(fontScriptBase, fontScriptValue)));
 
 } // namespace blink