Revert of Switch to HarfBuzz on Mac and remove CoreText shaper

Source/platform/fonts/FontPlatformData.cpp

 /*
  * Copyright (C) 2011 Brent Fulgham
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 135 matching lines @@
     , m_useSubpixelPositioning(source.m_useSubpixelPositioning)
     , m_minSizeForAntiAlias(source.m_minSizeForAntiAlias)
     , m_minSizeForSubpixel(source.m_minSizeForSubpixel)
 #endif
 {
 #if OS(MACOSX)
     platformDataInit(source);
 #endif
 }
 
-FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize)
-    : m_typeface(src.m_typeface)
-#if !OS(WIN)
-    , m_family(src.m_family)
-#endif
-    , m_textSize(textSize)
-    , m_syntheticBold(src.m_syntheticBold)
-    , m_syntheticItalic(src.m_syntheticItalic)
-    , m_orientation(src.m_orientation)
-#if OS(MACOSX)
-    , m_isColorBitmapFont(src.m_isColorBitmapFont)
-    , m_isCompositeFontReference(src.m_isCompositeFontReference)
-#endif
-    , m_widthVariant(RegularWidth)
-#if !OS(MACOSX)
-    , m_style(src.m_style)
-#endif
-    , m_harfBuzzFace(nullptr)
-    , m_isHashTableDeletedValue(false)
-#if OS(WIN)
-    , m_paintTextFlags(src.m_paintTextFlags)
-    , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
-    , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
-    , m_minSizeForSubpixel(src.m_minSizeForSubpixel)
-#endif
-{
-#if OS(MACOSX)
-    platformDataInit(src);
-#else
-    querySystemForRenderStyle(FontDescription::subpixelPositioning());
-#endif
-}
 
 #if OS(MACOSX)
 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
     : m_typeface(nullptr)
     , m_family(CString())
     , m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
     , m_isColorBitmapFont(false)
@@ skipping 21 matching lines @@
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(subpixelTextPosition)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
     querySystemForRenderStyle(subpixelTextPosition);
 }
 
+
+FontPlatformData::FontPlatformData(const FontPlatformData& src, float textSize)
+    : m_typeface(src.m_typeface)
+#if !OS(WIN)
+    , m_family(src.m_family)
+#endif
+    , m_textSize(textSize)
+    , m_syntheticBold(src.m_syntheticBold)
+    , m_syntheticItalic(src.m_syntheticItalic)
+    , m_orientation(src.m_orientation)
+    , m_widthVariant(RegularWidth)
+    , m_harfBuzzFace(nullptr)
+    , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+    , m_paintTextFlags(src.m_paintTextFlags)
+    , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
+    , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
+    , m_minSizeForSubpixel(src.m_minSizeForSubpixel)
+#endif
+{
+    querySystemForRenderStyle(FontDescription::subpixelPositioning());
+}
 #endif
 
 FontPlatformData::~FontPlatformData()
 {
 #if OS(MACOSX)
     if (m_font)
         CFRelease(m_font);
 #endif
 }
 
@@ skipping 93 matching lines @@
 {
 #if OS(MACOSX)
     if (!m_typeface)
         m_typeface = adoptRef(SkCreateTypefaceFromCTFont(ctFont()));
 #endif
     return m_typeface.get();
 }
 
 HarfBuzzFace* FontPlatformData::harfBuzzFace() const
 {
+#if OS(MACOSX)
+    CTFontRef font = ctFont();
+    // Keeping the decision not to pass AAT font to HarfBuzz for now,
+    // until we switch to HarfBuzz as a shaper for all cases.
+    if (isAATFont(font))
+        return 0;
+#endif
     if (!m_harfBuzzFace)
         m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID());
 
     return m_harfBuzzFace.get();
 }
 
 } // namespace blink