Merge FontPlatformDataHarfBuzz into FontPlatformData

Source/platform/fonts/FontPlatformData.h

Index: Source/platform/fonts/FontPlatformData.h
diff --git a/Source/platform/fonts/FontPlatformData.h b/Source/platform/fonts/FontPlatformData.h
index f20441f07b1d2bc598e1600e5185dc1944b6a6e9..ed132829e0298a0d2ed0fbd1682b851429a11f24 100644
--- a/Source/platform/fonts/FontPlatformData.h
+++ b/Source/platform/fonts/FontPlatformData.h
@@ -75,13 +75,12 @@ public:
     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
@@ -120,6 +119,8 @@ public:
     void setSyntheticItalic(bool syntheticItalic) { m_syntheticItalic = syntheticItalic; }
     bool operator==(const FontPlatformData&) const;
     const FontPlatformData& operator=(const FontPlatformData&);
+
+

[Daniel Erat, 2014/09/09 21:17:12]

nit: one blank line instead of two? feel free to ignore me if i'm confused about
blink style

     bool isHashTableDeletedValue() const { return m_isHashTableDeletedValue; }
 #if OS(WIN)
     void setMinSizeForAntiAlias(unsigned size) { m_minSizeForAntiAlias = size; }
@@ -167,10 +168,9 @@ private:
     // 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;
@@ -186,8 +186,8 @@ public:
 #if OS(MACOSX)
     bool m_isColorBitmapFont;
     bool m_isCompositeFontReference;
-    FontWidthVariant m_widthVariant;
 #endif
+    FontWidthVariant m_widthVariant;
 private:
 #if OS(MACOSX)
     NSFont* m_font;