Merge FontPlatformDataHarfBuzz into FontPlatformData

Source/platform/fonts/FontPlatformData.cpp

Index: Source/platform/fonts/FontPlatformData.cpp
diff --git a/Source/platform/fonts/FontPlatformData.cpp b/Source/platform/fonts/FontPlatformData.cpp
index 8fefa55746d0f89c9e24a91bbc4fd40e0ca8ab5e..137c98075c175b2cb89c2de8e2aadb7a10cf545b 100644
--- a/Source/platform/fonts/FontPlatformData.cpp
+++ b/Source/platform/fonts/FontPlatformData.cpp
@@ -28,7 +28,7 @@
 #include "wtf/text/WTFString.h"
 
 #if OS(MACOSX)
-#include "platform/fonts/harfbuzz/HarfBuzzFace.h"
+#include "third_party/skia/include/ports/SkTypeface_mac.h"
 #endif
 
 using namespace std;
@@ -36,53 +36,120 @@ using namespace std;
 namespace blink {
 
 FontPlatformData::FontPlatformData(WTF::HashTableDeletedValueType)
-    : m_textSize(0)
+    : 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)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
+#endif
     , m_widthVariant(RegularWidth)
 #if OS(MACOSX)
     , m_font(nullptr)
 #endif
     , m_isHashTableDeletedValue(true)
+#if OS(WIN)
+    , m_paintTextFlags(0)
+    , m_minSizeForAntiAlias(0)
+    , m_useSubpixelPositioning(false)
+#endif
 {
 }
 
 FontPlatformData::FontPlatformData()
-    : m_textSize(0)
+    : 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)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
+#endif
     , m_widthVariant(RegularWidth)
 #if OS(MACOSX)
     , m_font(nullptr)
 #endif
     , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+    , m_paintTextFlags(0)
+    , m_minSizeForAntiAlias(0)
+    , m_useSubpixelPositioning(false)
+#endif
 {
 }
 
 FontPlatformData::FontPlatformData(float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
-    : m_textSize(size)
+    : 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)
     , m_isColorBitmapFont(false)
     , m_isCompositeFontReference(false)
+#endif
     , m_widthVariant(widthVariant)
 #if OS(MACOSX)
     , m_font(nullptr)
 #endif
     , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+    , m_paintTextFlags(0)
+    , m_minSizeForAntiAlias(0)
+    , m_useSubpixelPositioning(false)
+#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
+    , m_widthVariant(source.m_widthVariant)
+#if !OS(MACOSX)
+    , m_style(source.m_style)
+#endif
+    , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+    , m_paintTextFlags(source.m_paintTextFlags)
+    , m_minSizeForAntiAlias(source.m_minSizeForAntiAlias)
+    , m_useSubpixelPositioning(source.m_useSubpixelPositioning)
+#endif
 {
+#if OS(MACOSX)
+    platformDataInit(source);
+#endif
 }
 
+
 #if OS(MACOSX)
 FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticBold, bool syntheticItalic, FontOrientation orientation, FontWidthVariant widthVariant)
-    : m_textSize(size)
+    : m_typeface(nullptr)
+#if !OS(WIN)
+    , m_family(CString())
+#endif
+    , m_textSize(size)
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
@@ -94,19 +161,56 @@ FontPlatformData::FontPlatformData(CGFontRef cgFont, float size, bool syntheticB
     , 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_minSizeForAntiAlias(0)
+    , m_useSubpixelPositioning(subpixelTextPosition)
+#endif
+{
+    querySystemForRenderStyle(subpixelTextPosition);
+}
 
-FontPlatformData::FontPlatformData(const FontPlatformData& source)
-    : m_textSize(source.m_textSize)
-    , m_syntheticBold(source.m_syntheticBold)
-    , m_syntheticItalic(source.m_syntheticItalic)
-    , m_orientation(source.m_orientation)
-    , m_isColorBitmapFont(source.m_isColorBitmapFont)
-    , m_isCompositeFontReference(source.m_isCompositeFontReference)
-    , m_widthVariant(source.m_widthVariant)
+
+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_harfBuzzFace(nullptr)
     , m_isHashTableDeletedValue(false)
+#if OS(WIN)
+    , m_paintTextFlags(src.m_paintTextFlags)
+    , m_minSizeForAntiAlias(src.m_minSizeForAntiAlias)
+    , m_useSubpixelPositioning(src.m_useSubpixelPositioning)
+#endif
 {
-    platformDataInit(source);
+    querySystemForRenderStyle(FontDescription::subpixelPositioning());
+}
+#endif
+
+FontPlatformData::~FontPlatformData()
+{
+#if OS(MACOSX)
+    if (m_font)
+        CFRelease(m_font);
+#endif
 }
 
 const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& other)
@@ -115,21 +219,48 @@ const FontPlatformData& FontPlatformData::operator=(const FontPlatformData& othe
     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_orientation = other.m_orientation;
-    m_textSize = other.m_textSize;
     m_widthVariant = other.m_widthVariant;
+#if OS(MACOSX)
     m_isColorBitmapFont = other.m_isColorBitmapFont;
     m_isCompositeFontReference = other.m_isCompositeFontReference;
+#else
+    m_style = other.m_style;
+#endif
+    m_widthVariant = other.m_widthVariant;
 
+#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 !OS(MACOSX)
+    if (!m_typeface || !a.m_typeface)
+        typefacesEqual = m_typeface == a.m_typeface;
+    else
+        typefacesEqual = SkTypeface::Equal(m_typeface.get(), a.m_typeface.get());
+#else
+    if (m_font || a.m_font)
+        typefacesEqual = m_font == a.m_font;
+    else
+        typefacesEqual = m_cgFont == a.m_cgFont;
+#endif
 
-    return platformIsEqual(a)
+    return typefacesEqual
         && m_textSize == a.m_textSize
         && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue
         && m_syntheticBold == a.m_syntheticBold
@@ -137,11 +268,68 @@ bool FontPlatformData::operator==(const FontPlatformData& a) const
         && m_orientation == a.m_orientation
 #if !OS(MACOSX)
         && m_style == a.m_style
-#endif
+#else
         && m_isColorBitmapFont == a.m_isColorBitmapFont
         && m_isCompositeFontReference == a.m_isCompositeFontReference
+#endif
         && m_widthVariant == a.m_widthVariant;
 }
 
 
+
+SkFontID FontPlatformData::uniqueID() const
+{
+    return m_typeface->uniqueID();
+}
+
+String FontPlatformData::fontFamilyName() const
+{
+    // FIXME(crbug.com/326582): come up with a proper way of handling SVG.
+    if (!this->typeface())
+        return "";
+    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)
+    if (m_typeface)
+        return m_typeface.get();
+
+    m_typeface = adoptRef(SkCreateTypefaceFromCTFont(ctFont()));
+    return m_typeface.get();
+#else
+    return m_typeface.get();
+#endif
+}
+
+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