Add CSS support for font-variation-settings

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2015 Collabora Ltd. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 164 matching lines @@
 }
 
 void FontBuilder::setFontSmoothing(FontSmoothingMode foontSmoothingMode) {
   set(PropertySetFlag::FontSmoothing);
 
   m_fontDescription.setFontSmoothing(foontSmoothingMode);
 }
 
 void FontBuilder::setFeatureSettings(PassRefPtr<FontFeatureSettings> settings) {
   set(PropertySetFlag::FeatureSettings);
+  m_fontDescription.setFeatureSettings(std::move(settings));
+}
 
-  m_fontDescription.setFeatureSettings(std::move(settings));
+void FontBuilder::setVariationSettings(
+    PassRefPtr<FontVariationSettings> settings) {
+  set(PropertySetFlag::VariationSettings);
+  m_fontDescription.setVariationSettings(std::move(settings));
 }
 
 void FontBuilder::setFamilyDescription(
     FontDescription& fontDescription,
     const FontDescription::FamilyDescription& familyDescription) {
   set(PropertySetFlag::Family);
 
   bool isInitial =
       familyDescription.genericFamily == FontDescription::StandardFamily &&
       familyDescription.family.familyIsEmpty();
@@ skipping 176 matching lines @@
   if (isSet(PropertySetFlag::Locale))
     description.setLocale(m_fontDescription.locale());
   if (isSet(PropertySetFlag::Style))
     description.setStyle(m_fontDescription.style());
   if (isSet(PropertySetFlag::VariantCaps))
     description.setVariantCaps(m_fontDescription.variantCaps());
   if (isSet(PropertySetFlag::VariantLigatures))
     description.setVariantLigatures(m_fontDescription.getVariantLigatures());
   if (isSet(PropertySetFlag::VariantNumeric))
     description.setVariantNumeric(m_fontDescription.variantNumeric());
+  if (isSet(PropertySetFlag::VariationSettings))
+    description.setVariationSettings(m_fontDescription.variationSettings());
   if (isSet(PropertySetFlag::TextRendering))
     description.setTextRendering(m_fontDescription.textRendering());
   if (isSet(PropertySetFlag::Kerning))
     description.setKerning(m_fontDescription.getKerning());
   if (isSet(PropertySetFlag::FontSmoothing))
     description.setFontSmoothing(m_fontDescription.fontSmoothing());
   if (isSet(PropertySetFlag::TextOrientation) ||
       isSet(PropertySetFlag::WritingMode))
     updateOrientation(description, style);
 
@@ skipping 17 matching lines @@
           FontDescription::Size(FontSize::initialKeywordSize(), 0.0f, false));
   updateSpecifiedSize(fontDescription, documentStyle);
   updateComputedSize(fontDescription, documentStyle);
 
   updateOrientation(fontDescription, documentStyle);
   documentStyle.setFontDescription(fontDescription);
   documentStyle.font().update(fontSelector);
 }
 
 }  // namespace blink