Revert of Revert of Remove Mac native font type members from FontPlatformData

Source/platform/fonts/mac/FontCacheMac.mm

Index: Source/platform/fonts/mac/FontCacheMac.mm
diff --git a/Source/platform/fonts/mac/FontCacheMac.mm b/Source/platform/fonts/mac/FontCacheMac.mm
index 0b54574eb1041d324b4bb2c221a4fb37e30a6be1..14ac4e6ab7dea82b34f99dc4c7e997bc99e0faf2 100644
--- a/Source/platform/fonts/mac/FontCacheMac.mm
+++ b/Source/platform/fonts/mac/FontCacheMac.mm
@@ -31,18 +31,18 @@
 #import "platform/fonts/FontCache.h"
 
 #import <AppKit/AppKit.h>
-#import "platform/LayoutTestSupport.h"
-#import "platform/RuntimeEnabledFeatures.h"
-#import "platform/fonts/FontDescription.h"
-#import "platform/fonts/FontFaceCreationParams.h"
-#import "platform/fonts/FontPlatformData.h"
-#import "platform/fonts/SimpleFontData.h"
-#import "platform/fonts/mac/FontFamilyMatcherMac.h"
-#import "public/platform/Platform.h"
-#import "public/platform/WebTraceLocation.h"
-#import <wtf/Functional.h>
-#import <wtf/MainThread.h>
-#import <wtf/StdLibExtras.h>
+#include "platform/LayoutTestSupport.h"
+#include "platform/RuntimeEnabledFeatures.h"
+#include "platform/fonts/FontDescription.h"
+#include "platform/fonts/FontFaceCreationParams.h"
+#include  "platform/fonts/FontPlatformData.h"
+#include "platform/fonts/SimpleFontData.h"
+#include "platform/fonts/mac/FontFamilyMatcherMac.h"
+#include "public/platform/Platform.h"
+#include "public/platform/WebTraceLocation.h"
+#include <wtf/Functional.h>
+#include <wtf/MainThread.h>
+#include <wtf/StdLibExtras.h>
 
 // Forward declare Mac SPIs.
 // Request for public API: rdar://13803570
@@ -119,7 +119,7 @@
     }
 
     const FontPlatformData& platformData = fontDataToSubstitute->platformData();
-    NSFont *nsFont = platformData.font();
+    NSFont* nsFont = toNSFont(platformData.ctFont());
 
     NSString *string = [[NSString alloc] initWithCharactersNoCopy:codeUnits length:codeUnitsLength freeWhenDone:NO];
     NSFont *substituteFont = [NSFont findFontLike:nsFont forString:string withRange:NSMakeRange(0, codeUnitsLength) inLanguage:nil];
@@ -220,11 +220,14 @@
     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();
 }