Revert of Remove Mac native font type members from FontPlatformData

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 28 matching lines @@
 
 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
     : m_typeface(nullptr)
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
-#if !OS(MACOSX)
+#if OS(MACOSX)
+    , m_isColorBitmapFont(false)
+    , m_isCompositeFontReference(false)
+    , m_font(nullptr)
+#else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(true)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData()
     : m_typeface(nullptr)
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(0)
     , m_syntheticBold(false)
     , m_syntheticItalic(false)
     , m_orientation(Horizontal)
-#if !OS(MACOSX)
+#if OS(MACOSX)
+    , m_isColorBitmapFont(false)
+    , m_isCompositeFontReference(false)
+    , m_font(nullptr)
+#else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation)
     : m_typeface(nullptr)
 #if !OS(WIN)
     , m_family(CString())
 #endif
     , m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
-#if !OS(MACOSX)
+#if OS(MACOSX)
+    , m_isColorBitmapFont(false)
+    , m_isCompositeFontReference(false)
+    , m_font(nullptr)
+#else
     , m_style(FontRenderStyle())
 #endif
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(false)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
 }
 
 FontPlatformData::FontPlatformData(const FontPlatformData& source)
     : m_typeface(source.m_typeface)
 #if !OS(WIN)
     , m_family(source.m_family)
 #endif
     , m_textSize(source.m_textSize)
     , m_syntheticBold(source.m_syntheticBold)
     , m_syntheticItalic(source.m_syntheticItalic)
     , m_orientation(source.m_orientation)
+#if OS(MACOSX)
+    , m_isColorBitmapFont(source.m_isColorBitmapFont)
+    , m_isCompositeFontReference(source.m_isCompositeFontReference)
+#endif
 #if !OS(MACOSX)
     , m_style(source.m_style)
 #endif
     , m_harfBuzzFace(nullptr)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(source.m_paintTextFlags)
     , 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
 #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)
+#if OS(MACOSX)
+    platformDataInit(src);
+#else
     querySystemForRenderStyle(FontDescription::subpixelPositioning());
 #endif
 }
 
+#if OS(MACOSX)
+FontPlatformData::FontPlatformData(CGFontRef cgFont, PassRefPtr<SkTypeface> tf, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation)
+    : m_typeface(tf)
+    , m_family(CString())
+    , m_textSize(size)
+    , m_syntheticBold(syntheticBold)
+    , m_syntheticItalic(syntheticItalic)
+    , m_orientation(orientation)
+    , m_isColorBitmapFont(false)
+    , m_isCompositeFontReference(false)
+    , m_font(nullptr)
+    , m_cgFont(cgFont)
+    , m_isHashTableDeletedValue(false)
+{
+}
+
+#else
+
 FontPlatformData::FontPlatformData(PassRefPtr<SkTypeface> tf, const char* family, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, bool subpixelTextPosition)
     : m_typeface(tf)
 #if !OS(WIN)
     , m_family(family)
 #endif
     , m_textSize(textSize)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
     , m_isHashTableDeletedValue(false)
 #if OS(WIN)
     , m_paintTextFlags(0)
     , m_useSubpixelPositioning(subpixelTextPosition)
     , m_minSizeForAntiAlias(0)
     , m_minSizeForSubpixel(0)
 #endif
 {
-#if !OS(MACOSX)
     querySystemForRenderStyle(subpixelTextPosition);
+}
+
+#endif
+
+FontPlatformData::~FontPlatformData()
+{
+#if OS(MACOSX)
+    if (m_font)
+        CFRelease(m_font);
 #endif
 }
 
-FontPlatformData::~FontPlatformData()
-{
-}
-
-#if OS(MACOSX)
-CTFontRef FontPlatformData::ctFont() const
-{
-    return SkTypeface_GetCTFontRef(m_typeface.get());
-};
-
-CGFontRef FontPlatformData::cgFont() const
-{
-    return CTFontCopyGraphicsFont(ctFont(), 0);
-}
-#endif
-
 const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& other)
 {
     // Check for self-assignment.
     if (this == &other)
         return *this;
 
     m_typeface = other.m_typeface;
 #if !OS(WIN)
     m_family = other.m_family;
 #endif
     m_textSize = other.m_textSize;
     m_syntheticBold = other.m_syntheticBold;
     m_syntheticItalic = other.m_syntheticItalic;
     m_harfBuzzFace = nullptr;
     m_orientation = other.m_orientation;
-#if !OS(MACOSX)
+#if OS(MACOSX)
+    m_isColorBitmapFont = other.m_isColorBitmapFont;
+    m_isCompositeFontReference = other.m_isCompositeFontReference;
+#else
     m_style = other.m_style;
 #endif
 
 #if OS(WIN)
     m_paintTextFlags = 0;
     m_minSizeForAntiAlias = other.m_minSizeForAntiAlias;
     m_minSizeForSubpixel = other.m_minSizeForSubpixel;
     m_useSubpixelPositioning = other.m_useSubpixelPositioning;
 #endif
 
+#if OS(MACOSX)
+    return platformDataAssign(other);
+#else
     return *this;
+#endif
 }
 
 bool FontPlatformData::operator==(const FontPlatformData& a) const
 {
     // If either of the typeface pointers are null then we test for pointer
     // equality. Otherwise, we call SkTypeface::Equal on the valid pointers.
     bool typefacesEqual = false;
     if (!typeface() || !a.typeface())
         typefacesEqual = typeface() == a.typeface();
     else
         typefacesEqual = SkTypeface::Equal(typeface(), a.typeface());
 
     return typefacesEqual
         && m_textSize == a.m_textSize
         && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue
         && m_syntheticBold == a.m_syntheticBold
         && m_syntheticItalic == a.m_syntheticItalic
+        && m_orientation == a.m_orientation
 #if !OS(MACOSX)
-        && m_style == a.m_style
+        && m_style == a.m_style;
+#else
+        && m_isColorBitmapFont == a.m_isColorBitmapFont
+        && m_isCompositeFontReference == a.m_isCompositeFontReference;
 #endif
-        && m_orientation == a.m_orientation;
 }
 
 SkFontID FontPlatformData::uniqueID() const
 {
     return typeface()->uniqueID();
 }
 
 String FontPlatformData::fontFamilyName() const
 {
     ASSERT(this->typeface());
     SkTypeface::LocalizedStrings* fontFamilyIterator = this->typeface()->createFamilyNameIterator();
     SkTypeface::LocalizedString localizedString;
     while (fontFamilyIterator->next(&localizedString) && !localizedString.fString.size()) { }
     fontFamilyIterator->unref();
     return String(localizedString.fString.c_str());
 }
 
 bool FontPlatformData::isFixedPitch() const
 {
     return typeface() && typeface()->isFixedPitch();
 }
 
 SkTypeface* FontPlatformData::typeface() const
 {
+#if OS(MACOSX)
+    // ctFont() will always generate a typeface, even for uninitialized font members.
+    // We only want to generate a Skia typeface if we have a valid font to start from,
+    // to keep hashing and comparisons to the empty object consistent.
+    if (!m_typeface && (m_font || m_cgFont || m_CTFont || m_inMemoryFont))
+        m_typeface = adoptRef(SkCreateTypefaceFromCTFont(ctFont()));
+#endif
     return m_typeface.get();
 }
 
 HarfBuzzFace* FontPlatformData::harfBuzzFace() const
 {
     if (!m_harfBuzzFace)
         m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID());
 
     return m_harfBuzzFace.get();
 }
@@ skipping 40 matching lines @@
     const size_t tableSize = m_typeface->getTableSize(tag);
     if (tableSize) {
         Vector<char> tableBuffer(tableSize);
         m_typeface->getTableData(tag, 0, tableSize, &tableBuffer[0]);
         buffer = SharedBuffer::adoptVector(tableBuffer);
     }
     return buffer.release();
 }
 
 } // namespace blink