Initial OpenType Font Variations Support

third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm

Index: third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm
diff --git a/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm b/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm
index 51655f7b1789540f71a68131b0a3ea301f1007c4..ec7a8d5d21e861354f71ef10737ad53d73f46045 100644
--- a/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm
+++ b/third_party/WebKit/Source/platform/fonts/mac/FontCacheMac.mm
@@ -216,7 +216,8 @@ PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
       substituteFont, platformData.size(), syntheticBold,
       (traits & NSFontItalicTrait) &&
           !(substituteFontTraits & NSFontItalicTrait),
-      platformData.orientation());
+      platformData.orientation(),
+      nullptr);  // No variation paramaters in fallback.
 
   return fontDataFromFontPlatformData(&alternateFont, DoNotRetain);
 }
@@ -281,9 +282,10 @@ std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(
   // font loading failing.  Out-of-process loading occurs for registered fonts
   // stored in non-system locations.  When loading fails, we do not want to use
   // the returned FontPlatformData since it will not have a valid SkTypeface.
-  std::unique_ptr<FontPlatformData> platformData = WTF::wrapUnique(
-      new FontPlatformData(platformFont, size, syntheticBold, syntheticItalic,
-                           fontDescription.orientation()));
+  std::unique_ptr<FontPlatformData> platformData =
+      WTF::wrapUnique(new FontPlatformData(
+          platformFont, size, syntheticBold, syntheticItalic,
+          fontDescription.orientation(), fontDescription.variationSettings()));
   if (!platformData->typeface()) {
     return nullptr;
   }