Remove Mac native font type members from FontPlatformData

Source/platform/fonts/FontCustomPlatformData.h

Index: Source/platform/fonts/FontCustomPlatformData.h
diff --git a/Source/platform/fonts/FontCustomPlatformData.h b/Source/platform/fonts/FontCustomPlatformData.h
index c2f7824767e492e52caa4ca54e74e8b394c3c77b..2144628f34f87c0d5f0ab2af3ca751c825f1387a 100644
--- a/Source/platform/fonts/FontCustomPlatformData.h
+++ b/Source/platform/fonts/FontCustomPlatformData.h
@@ -32,6 +32,7 @@
 #ifndef FontCustomPlatformData_h
 #define FontCustomPlatformData_h
 
+#include "SkTypeface.h"
 #include "platform/PlatformExport.h"
 #include "platform/fonts/FontOrientation.h"
 #include "wtf/Forward.h"
@@ -39,12 +40,6 @@
 #include "wtf/RefPtr.h"
 #include "wtf/text/WTFString.h"
 
-#if OS(MACOSX)
-#include "wtf/RetainPtr.h"
-#include <CoreFoundation/CFBase.h>
-typedef struct CGFont* CGFontRef;
-#endif
-
 class SkTypeface;
 
 namespace blink {
@@ -63,12 +58,10 @@ public:
     static bool supportsFormat(const String&);
 
 private:
-#if OS(MACOSX)
-    explicit FontCustomPlatformData(CGFontRef, PassRefPtr<SkTypeface>);
-    RetainPtr<CGFontRef> m_cgFont;
-#else
-    explicit FontCustomPlatformData(PassRefPtr<SkTypeface>);
-#endif
+    // TODO(dro): Move this back to the implementation file.
+    explicit FontCustomPlatformData(PassRefPtr<SkTypeface> typeface)
+        : m_typeface(typeface) { };
+
     RefPtr<SkTypeface> m_typeface;
 };