Initial OpenType Font Variations Support

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 198 matching lines @@
   // Bold emoji look the same as normal emoji, so syntheticBold isn't needed.
   bool syntheticBold =
       isAppKitFontWeightBold(weight) &&
       !isAppKitFontWeightBold(substituteFontWeight) &&
       ![substituteFont.familyName isEqual:@"Apple Color Emoji"];
 
   FontPlatformData alternateFont(
       substituteFont, platformData.size(), syntheticBold,
       (traits & NSFontItalicTrait) &&
           !(substituteFontTraits & NSFontItalicTrait),
-      platformData.orientation());
+      platformData.orientation(),
+      nullptr);  // No variation paramaters in fallback.
 
   return fontDataFromFontPlatformData(&alternateFont, DoNotRetain);
 }
 
 PassRefPtr<SimpleFontData> FontCache::getLastResortFallbackFont(
     const FontDescription& fontDescription,
     ShouldRetain shouldRetain) {
   DEFINE_STATIC_LOCAL(AtomicString, timesStr, ("Times"));
 
   // FIXME: Would be even better to somehow get the user's default font here.
@@ skipping 44 matching lines @@
                                  fontDescription.isSyntheticBold();
 
   bool syntheticItalic =
       ((traits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait)) ||
       fontDescription.isSyntheticItalic();
 
   // FontPlatformData::typeface() is null in the case of Chromium out-of-process
   // 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(

[kojii, 2016/12/21 14:53:12]

nit: nice to change to makeUnique in this opportunity?
http://dev.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-Prefer-...

[drott, 2016/12/21 15:22:00]

Done.

+          platformFont, size, syntheticBold, syntheticItalic,
+          fontDescription.orientation(), fontDescription.variationSettings()));
   if (!platformData->typeface()) {
     return nullptr;
   }
   return platformData;
 }
 
 }  // namespace blink