Merge FontPlatformDataHarfBuzz into FontPlatformData

Source/platform/fonts/cocoa/FontPlatformDataCocoa.mm

 /*
  * This file is part of the internal font implementation.
  *
  * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (c) 2010 Google Inc. All rights reserved.
  *
  * 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.
@@ skipping 10 matching lines @@
  *
  */
 
 #import "config.h"
 #import "platform/fonts/FontPlatformData.h"
 
 #import <AppKit/NSFont.h>
 #import <AvailabilityMacros.h>
 #import <wtf/text/WTFString.h>
 
-#if OS(MACOSX)
 #import "platform/fonts/harfbuzz/HarfBuzzFace.h"
 #include "third_party/skia/include/ports/SkTypeface_mac.h"
-#endif
 
 namespace blink {
 
 unsigned FontPlatformData::hash() const
 {
     ASSERT(m_font || !m_cgFont);
     uintptr_t hashCodes[3] = { (uintptr_t)m_font, m_widthVariant, static_cast<uintptr_t>(m_isHashTableDeletedValue << 3 | m_orientation << 2 | m_syntheticBold << 1 | m_syntheticItalic) };
     return StringHasher::hashMemory<sizeof(hashCodes)>(hashCodes);
 }
 
@@ skipping 27 matching lines @@
 #endif
     }
 #endif
 
     if (m_font)
         CFRetain(m_font);
 
     m_cgFont.adoptCF(cgFont);
 }
 
-FontPlatformData:: ~FontPlatformData()
-{
-    if (m_font && m_font != reinterpret_cast<NSFont *>(-1))
-        CFRelease(m_font);
-}
-
 void FontPlatformData::platformDataInit(const FontPlatformData& f)
 {
-    m_font = f.m_font && f.m_font != reinterpret_cast<NSFont *>(-1) ? [f.m_font retain] : f.m_font;
+    m_font = f.m_font ? [f.m_font retain] : f.m_font;
 
     m_cgFont = f.m_cgFont;
     m_CTFont = f.m_CTFont;
 
-#if OS(MACOSX)
     m_inMemoryFont = f.m_inMemoryFont;
     m_harfBuzzFace = f.m_harfBuzzFace;
     m_typeface = f.m_typeface;
-#endif
 }
 
 const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& f)
 {
     m_cgFont = f.m_cgFont;
     if (m_font == f.m_font)
         return *this;
-    if (f.m_font && f.m_font != reinterpret_cast<NSFont *>(-1))
+    if (f.m_font)
         CFRetain(f.m_font);
-    if (m_font && m_font != reinterpret_cast<NSFont *>(-1))
+    if (m_font)
         CFRelease(m_font);
     m_font = f.m_font;
     m_CTFont = f.m_CTFont;
-#if OS(MACOSX)
+
     m_inMemoryFont = f.m_inMemoryFont;
     m_harfBuzzFace = f.m_harfBuzzFace;
     m_typeface = f.m_typeface;
-#endif
+
     return *this;
 }
 
-bool FontPlatformData::platformIsEqual(const FontPlatformData& other) const
-{
-    if (m_font || other.m_font)
-        return m_font == other.m_font;
-    return m_cgFont == other.m_cgFont;
-}
 
 void FontPlatformData::setFont(NSFont *font)
 {
     ASSERT_ARG(font, font);
-    ASSERT(m_font != reinterpret_cast<NSFont *>(-1));
 
     if (m_font == font)
         return;
 
     CFRetain(font);
     if (m_font)
         CFRelease(m_font);
     m_font = font;
     m_textSize = [font pointSize];
 
     CGFontRef cgFont = 0;
     NSFont* loadedFont = 0;
     loadFont(m_font, m_textSize, loadedFont, cgFont);
 
-#if OS(MACOSX)
     // If loadFont replaced m_font with a fallback font, then release the
     // previous font to counter the retain above. Then retain the new font.
     if (loadedFont != m_font) {
         CFRelease(m_font);
         CFRetain(loadedFont);
         m_font = loadedFont;
     }
-#endif
 
     m_cgFont.adoptCF(cgFont);
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
     {
         CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
         m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
         m_isCompositeFontReference = traits & kCTFontCompositeTrait;
 #endif
     }
@@ skipping 72 matching lines @@
 
     const void* keys[] = { kCTFontFeatureSettingsAttribute };
     const void* values[] = { featureSettings.get() };
     RetainPtr<CFDictionaryRef> attributes(AdoptCF, CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
 
     descriptor = CTFontDescriptorCreateCopyWithAttributes(cascadeToLastResortFontDescriptor(), attributes.get());
 
     return descriptor;
 }
 
-String FontPlatformData::fontFamilyName() const
-{
-    return String(CTFontCopyDisplayName(ctFont()));
-}
-
 CTFontRef FontPlatformData::ctFont() const
 {
     if (m_CTFont)
         return m_CTFont.get();
 
     if (m_inMemoryFont) {
         m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_inMemoryFont->cgFont(), m_textSize, 0, cascadeToLastResortFontDescriptor()));
         return m_CTFont.get();
     }
 
@@ skipping 19 matching lines @@
         RetainPtr<CTFontDescriptorRef> newDescriptor(AdoptCF, CTFontDescriptorCreateCopyWithFeature(sourceDescriptor.get(), featureType.get(), featureSelector.get()));
         RetainPtr<CTFontRef> newFont(AdoptCF, CTFontCreateWithFontDescriptor(newDescriptor.get(), m_textSize, 0));
 
         if (newFont)
             m_CTFont = newFont;
     }
 
     return m_CTFont.get();
 }
 
-SkTypeface* FontPlatformData::typeface() const {
-    if (m_typeface)
-        return m_typeface.get();
-
-    m_typeface = adoptRef(SkCreateTypefaceFromCTFont(ctFont()));
-    return m_typeface.get();
-}
-
-#if OS(MACOSX)
-static bool isAATFont(CTFontRef ctFont)
+bool FontPlatformData::isAATFont(CTFontRef ctFont) const
 {
     CFDataRef table = CTFontCopyTable(ctFont, kCTFontTableMort, 0);
     if (table) {
         CFRelease(table);
         return true;
     }
     table = CTFontCopyTable(ctFont, kCTFontTableMorx, 0);
     if (table) {
         CFRelease(table);
         return true;
     }
     return false;
 }
-#endif
-
-HarfBuzzFace* FontPlatformData::harfBuzzFace() const
-{
-    CTFontRef font = ctFont();
-    // HarfBuzz can't handle AAT font
-    if (isAATFont(font))
-        return 0;
-
-    if (!m_harfBuzzFace) {
-        uint64_t uniqueID = reinterpret_cast<uintptr_t>(font);
-        m_harfBuzzFace = HarfBuzzFace::create(const_cast<FontPlatformData*>(this), uniqueID);
-    }
-    return m_harfBuzzFace.get();
-}
-
 
 } // namespace blink