Remove Mac native font type members from FontPlatformData

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 99 matching lines @@
     if (character <= 0xFFFF) {
         codeUnits[0] = character;
         codeUnitsLength = 1;
     } else {
         codeUnits[0] = U16_LEAD(character);
         codeUnits[1] = U16_TRAIL(character);
         codeUnitsLength = 2;
     }
 
     const FontPlatformData& platformData = fontDataToSubstitute->platformData();
-    NSFont *nsFont = platformData.font();
+    NSFont* nsFont = const_cast<NSFont*>(reinterpret_cast<const NSFont*>(platformData.ctFont()));

[Robert Sesek, 2015/02/24 16:13:07]

Can you create something lke toCTFontRef() or leave a comment saying that CTFont
is toll-free bridged to NSFont?

[Dominik Röttsches, 2015/03/19 15:20:00]

Added toNSFont to FontPlatformData.h

 
     NSString *string = [[NSString alloc] initWithCharactersNoCopy:codeUnits length:codeUnitsLength freeWhenDone:NO];
     NSFont *substituteFont = [NSFont findFontLike:nsFont forString:string withRange:NSMakeRange(0, codeUnitsLength) inLanguage:nil];
     [string release];
 
     // FIXME: Remove this SPI usage: http://crbug.com/255122
     if (!substituteFont && codeUnitsLength == 1)
         substituteFont = [NSFont findFontLike:nsFont forCharacter:codeUnits[0] inLanguage:nil];
     if (!substituteFont)
         return nullptr;
@@ skipping 80 matching lines @@
     NSFontManager *fontManager = [NSFontManager sharedFontManager];
     NSFontTraitMask actualTraits = 0;
     if (fontDescription.style())
         actualTraits = [fontManager traitsOfFont:nsFont];
     NSInteger actualWeight = [fontManager weightOfFont:nsFont];
 
     NSFont *platformFont = useHinting() ? [nsFont screenFont] : [nsFont printerFont];
     bool syntheticBold = (isAppKitFontWeightBold(weight) && !isAppKitFontWeightBold(actualWeight)) || fontDescription.isSyntheticBold();
     bool syntheticItalic = ((traits & NSFontItalicTrait) && !(actualTraits & NSFontItalicTrait)) || fontDescription.isSyntheticItalic();
 
-    // FontPlatformData::font() can be null for the case of Chromium out-of-process font loading.
-    // In that case, we don't want to use the platformData.
+    // 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.
     OwnPtr<FontPlatformData> platformData = adoptPtr(new FontPlatformData(platformFont, size, syntheticBold, syntheticItalic, fontDescription.orientation()));
-    if (!platformData->font())
-        return 0;
+    if (!platformData->typeface()) {
+        return nullptr;
+    }
     return platformData.leakPtr();
 }
 
 } // namespace blink