Merge FontPlatformDataHarfBuzz and FontPlatformData headers

Source/platform/fonts/mac/FontMac.cpp

Index: Source/platform/fonts/mac/FontMac.cpp
diff --git a/Source/platform/fonts/mac/FontMac.cpp b/Source/platform/fonts/mac/FontMac.cpp
index f0b22465f7544d1ef84cda8682c9de84f45b35b4..6c678b1a110a1caa3ece0132fcdf03394ed51065 100644
--- a/Source/platform/fonts/mac/FontMac.cpp
+++ b/Source/platform/fonts/mac/FontMac.cpp
@@ -57,7 +57,7 @@ bool FontPlatformFeatures::canExpandAroundIdeographsInComplexText()
 static void setupPaint(SkPaint* paint, const SimpleFontData* fontData, const Font* font, bool shouldAntialias, bool shouldSmoothFonts)
 {
     const FontPlatformData& platformData = fontData->platformData();
-    const float textSize = platformData.m_size >= 0 ? platformData.m_size : 12;
+    const float textSize = platformData.m_textSize >= 0 ? platformData.m_textSize : 12;
 
     paint->setAntiAlias(shouldAntialias);
     paint->setEmbeddedBitmapText(false);
@@ -65,7 +65,7 @@ static void setupPaint(SkPaint* paint, const SimpleFontData* fontData, const Fon
     paint->setVerticalText(platformData.orientation() == Vertical);
     paint->setTypeface(platformData.typeface());
     paint->setFakeBoldText(platformData.m_syntheticBold);
-    paint->setTextSkewX(platformData.m_syntheticOblique ? -SK_Scalar1 / 4 : 0);
+    paint->setTextSkewX(platformData.m_syntheticItalic ? -SK_Scalar1 / 4 : 0);
     paint->setAutohinted(false); // freetype specific
     paint->setLCDRenderText(shouldSmoothFonts);
     paint->setSubpixelText(true);