Revert "Merge FontPlatformDataHarfBuzz into 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 57 matching lines @@
 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&);
+#if OS(MACOSX)
     FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
-#if OS(MACOSX)
     FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticItalic = false,
                      FontOrientation = Horizontal, FontWidthVariant = RegularWidth);
     FontPlatformData(CGFontRef, float size, bool syntheticBold, bool syntheticOblique, FontOrientation, FontWidthVariant);
 #else
+    FontPlatformData(float textSize, bool syntheticBold, bool syntheticItalic);
     FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = Horizontal, bool subpixelTextPosition = defaultUseSubpixelPositioning());
     FontPlatformData(const FontPlatformData& src, float textSize);
 #endif
     ~FontPlatformData();
 
 #if OS(MACOSX)
     NSFont* font() const { return m_font; }
     void setFont(NSFont*);
 
     CGFontRef cgFont() const { return m_cgFont.get(); }
@@ skipping 18 matching lines @@
     HarfBuzzFace* harfBuzzFace() const;
     SkFontID uniqueID() const;
     unsigned hash() const;
 
     FontOrientation orientation() const { return m_orientation; }
     void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
     void setSyntheticBold(bool syntheticBold) { m_syntheticBold = syntheticBold; }
     void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheticItalic; }
     bool operator==(const FontPlatformData&) const;
     const FontPlatformData& operator=(const FontPlatformData&);
-
     bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }
 #if OS(WIN)
     void setMinSizeForAntiAlias(unsigned size) { m_minSizeForAntiAlias = size; }
     unsigned minSizeForAntiAlias() const { return m_minSizeForAntiAlias; }
     void setMinSizeForSubpixel(float size) { m_minSizeForSubpixel = size; }
     float minSizeForSubpixel() const { return m_minSizeForSubpixel; }
     void setHinting(SkPaint::Hinting style)
     {
         m_style.useAutoHint = 0;
         m_style.hintStyle = style;
@@ skipping 27 matching lines @@
     bool static defaultUseSubpixelPositioning();
     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&);
+
+    bool platformIsEqual(const FontPlatformData&) const;
     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;
+    FontWidthVariant m_widthVariant;
 #endif
-    FontWidthVariant m_widthVariant;
 private:
 #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