Revert of Remove Mac native font type members from FontPlatformData

Source/platform/fonts/FontPlatformData.h

 /*
  * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 32 matching lines @@
 #include "wtf/RefPtr.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringImpl.h"
 
 #if OS(MACOSX)
 OBJC_CLASS NSFont;
 
 typedef struct CGFont* CGFontRef;
 typedef const struct __CTFont* CTFontRef;
 
+#include "platform/fonts/mac/MemoryActivatedFont.h"
+#include <CoreFoundation/CFBase.h>
 #include <objc/objc-auto.h>
 
 inline CTFontRef toCTFontRef(NSFont *nsFont) { return reinterpret_cast<CTFontRef>(nsFont); }
-inline NSFont* toNSFont(CTFontRef ctFontRef) { return const_cast<NSFont*>(reinterpret_cast<const NSFont*>(ctFontRef)); }
 #endif // OS(MACOSX)
 
 class SkTypeface;
 typedef uint32_t SkFontID;
 
 namespace blink {
 
 class Font;
 class GraphicsContext;
 class HarfBuzzFace;
 
 class PLATFORM_EXPORT FontPlatformData {
 public:
     // Used for deleted values in the font cache's hash tables. The hash table
     // will create us with this structure, and it will compare other values
     // to this "Deleted" one. It expects the Deleted one to be differentiable
     // from the 0 one (created with the empty constructor), so we can't just
     // set everything to 0.
     FontPlatformData(WTF::HashTableDeletedValueType);
     FontPlatformData();
     FontPlatformData(const FontPlatformData&);
     FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal);
     FontPlatformData(const FontPlatformData& src, float textSize);
 #if OS(MACOSX)
     FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticItalic = false, FontOrientation = Horizontal);
+    FontPlatformData(CGFontRef, PassRefPtr<SkTypeface>, float size, bool syntheticBold, bool syntheticOblique, FontOrientation);
+#else
+    FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subpixelTextPosition = defaultUseSubpixelPositioning());
 #endif
-    FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subpixelTextPosition = defaultUseSubpixelPositioning());
     ~FontPlatformData();
 
 #if OS(MACOSX)
+    NSFont* font() const { return m_font; }
+    void setFont(NSFont*);
+
+    CGFontRef cgFont() const { return m_cgFont.get(); }
     CTFontRef ctFont() const;
-    CGFontRef cgFont() const;
+
+    bool roundsGlyphAdvances() const;
+    bool allowsLigatures() const;
+
+    bool isColorBitmapFont() const { return m_isColorBitmapFont; }
+    bool isCompositeFontReference() const { return m_isCompositeFontReference; }
 #endif
 
     String fontFamilyName() const;
     float size() const { return m_textSize; }
     bool isFixedPitch() const;
     bool syntheticBold() const { return m_syntheticBold; }
     bool syntheticItalic() const { return m_syntheticItalic; }
 
     SkTypeface* typeface() const;
     HarfBuzzFace* harfBuzzFace() const;
@@ skipping 34 matching lines @@
     int paintTextFlags() const { return m_paintTextFlags; }
 #else
     static void setHinting(SkPaint::Hinting);
     static void setAutoHint(bool);
     static void setUseBitmaps(bool);
     static void setAntiAlias(bool);
     static void setSubpixelRendering(bool);
 #endif
 
 private:
+#if !OS(MACOSX)
     bool static defaultUseSubpixelPositioning();
-#if !OS(MACOSX)
     void querySystemForRenderStyle(bool useSkiaSubpixelPositioning);
+#else
+    // Load various data about the font specified by |nsFont| with the size fontSize into the following output paramters:
+    // Note: Callers should always take into account that for the Chromium port, |outNSFont| isn't necessarily the same
+    // font as |nsFont|. This because the sandbox may block loading of the original font.
+    // * outNSFont - The font that was actually loaded, for the Chromium port this may be different than nsFont.
+    // The caller is responsible for calling CFRelease() on this parameter when done with it.
+    // * cgFont - CGFontRef representing the input font at the specified point size.
+    void loadFont(NSFont*, float fontSize, NSFont*& outNSFont, CGFontRef&);
+    void platformDataInit(const FontPlatformData&);
+    const FontPlatformData& platformDataAssign(const FontPlatformData&);
+    bool isAATFont(CTFontRef) const;
 #endif
 
     mutable RefPtr<SkTypeface> m_typeface;
 #if !OS(WIN)
     CString m_family;
 #endif
 
 public:
     float m_textSize;
     bool m_syntheticBold;
     bool m_syntheticItalic;
     FontOrientation m_orientation;
+#if OS(MACOSX)
+    bool m_isColorBitmapFont;
+    bool m_isCompositeFontReference;
+#endif
 private:
-#if !OS(MACOSX)
+#if OS(MACOSX)
+    NSFont* m_font;
+    RetainPtr<CGFontRef> m_cgFont;
+    mutable RetainPtr<CTFontRef> m_CTFont;
+    RefPtr<MemoryActivatedFont> m_inMemoryFont;
+#else
     FontRenderStyle m_style;
 #endif
 
     mutable RefPtr<HarfBuzzFace> m_harfBuzzFace;
     bool m_isHashTableDeletedValue;
 #if OS(WIN)
     int m_paintTextFlags;
     bool m_useSubpixelPositioning;
     unsigned m_minSizeForAntiAlias;
     float m_minSizeForSubpixel;
 #endif
 };
 
 } // namespace blink
 
 #endif // ifdef FontPlatformData_h