Remove Mac native font type members from FontPlatformData

Source/platform/fonts/mac/FontPlatformDataMac.mm

Index: Source/platform/fonts/mac/FontPlatformDataMac.mm
diff --git a/Source/platform/fonts/mac/FontPlatformDataMac.mm b/Source/platform/fonts/mac/FontPlatformDataMac.mm
index 94c888c4bead2ccd45c09ba048d60aece60d85df..9c6e1992589c5dcc0135b8f208243ff7515c68e7 100644
--- a/Source/platform/fonts/mac/FontPlatformDataMac.mm
+++ b/Source/platform/fonts/mac/FontPlatformDataMac.mm
@@ -28,14 +28,64 @@
 #import <AvailabilityMacros.h>
 #import <wtf/text/WTFString.h>
 
-#include "platform/LayoutTestSupport.h"
-#include "platform/fonts/Font.h"
+#import "platform/LayoutTestSupport.h"
+#import "platform/fonts/Font.h"
 #import "platform/fonts/shaping/HarfBuzzFace.h"
-#include "third_party/skia/include/ports/SkTypeface_mac.h"
+#import "public/platform/Platform.h"
+#import "public/platform/mac/WebSandboxSupport.h"
+#import "third_party/skia/include/ports/SkTypeface_mac.h"
 
+namespace blink {
 
+static bool canLoadInProcess(NSFont* nsFont) {
+    CGFontRef cgFont = CTFontCopyGraphicsFont(toCTFontRef(nsFont), 0);
+    NSString* fontName = (NSString*)CGFontCopyPostScriptName(cgFont);

[Robert Sesek, 2015/02/24 16:13:07]

Use reinterpret_cast<> again like in the other CF-to-NS conversion.

[Dominik Röttsches, 2015/03/19 15:20:00]

Done.

+    return ![fontName isEqualToString:@"LastResort"];
+}
 
-namespace blink {
+static CTFontDescriptorRef cascadeToLastResortFontDescriptor()
+{
+    static CTFontDescriptorRef descriptor;
+    if (descriptor)
+        return descriptor;
+
+    const void* keys[] = { kCTFontCascadeListAttribute };
+    const void* descriptors[] = { CTFontDescriptorCreateWithNameAndSize(CFSTR("LastResort"), 0) };

[Robert Sesek, 2015/02/24 16:13:07]

Functions that follow the Create naming scheme return objects that are strongly
owned. Using kCFTypeArrayCallBacks on the line below will cause all the values
to also be CFRetain'ed, which means that this object is leaked.

[Dominik Röttsches, 2015/03/19 15:20:00]

Tried to fixed this case by using RetainPtr wrappers. 

+    const void* values[] = { CFArrayCreate(kCFAllocatorDefault, descriptors, WTF_ARRAY_LENGTH(descriptors), &kCFTypeArrayCallBacks) };
+    RetainPtr<CFDictionaryRef> attributes(AdoptCF, CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));

[Robert Sesek, 2015/02/24 16:13:07]

Similarly, the array in |values| will be leaked because of
kCFTypeDictionaryValueCallBacks.

[Dominik Röttsches, 2015/03/19 15:20:00]

Hopefully fixed by using a RetainPtr here as well.

+
+    descriptor = CTFontDescriptorCreateWithAttributes(attributes.get());
+
+    return descriptor;
+}
+
+static PassRefPtr<SkTypeface> loadFromBrowserProcess(NSFont* nsFont, float textSize)
+{
+    CGFontRef cgFont;
+    uint32_t fontID;
+    // Send cross-process request to load font.
+    WebSandboxSupport* sandboxSupport = Platform::current()->sandboxSupport();
+    if (!sandboxSupport) {
+        // This function should only be called in response to an error loading a
+        // font due to being blocked by the sandbox.
+        // This by definition shouldn't happen if there is no sandbox support.
+        ASSERT_NOT_REACHED();
+        return nullptr;
+    }
+    if (!sandboxSupport->loadFont(nsFont, &cgFont, &fontID)) {
+        // TODO crbug.com/461279: Make this appear in the inspector console?
+        WTF_LOG_ERROR("Loading user font \"%s\" from non system location failed. Corrupt or missing font file?", [[nsFont familyName] UTF8String]);
+        return nullptr;
+    }
+
+    CTFontRef ctFont = CTFontCreateWithGraphicsFont(cgFont, textSize, 0, cascadeToLastResortFontDescriptor());

[Robert Sesek, 2015/02/24 16:13:07]

Create is strong ref. Unless SkCreateTypefaceFromCTFont adopts the reference,
then this is leaked.

[Dominik Röttsches, 2015/03/19 15:20:00]

Yes, Skia does not adopt the reference. [1] Wrapped in a RetainPtr.

[1]
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/skia/s...

+    PassRefPtr<SkTypeface> returnFont = adoptRef(SkCreateTypefaceFromCTFont(ctFont));
+
+    if (!returnFont.get())
+        // TODO crbug.com/461279: Make this appear in the inspector console?
+        WTF_LOG_ERROR("Instantiating SkTypeface from user font failed for font family \"%s\".", [[nsFont familyName] UTF8String]);
+    return returnFont;
+}
 
 void FontPlatformData::setupPaint(SkPaint* paint, GraphicsContext*, const Font* font) const
 {
@@ -86,186 +136,23 @@ FontPlatformData::FontPlatformData(NSFont *nsFont, float size, bool syntheticBol
     , m_syntheticBold(syntheticBold)
     , m_syntheticItalic(syntheticItalic)
     , m_orientation(orientation)
-    , m_isColorBitmapFont(false)
-    , m_isCompositeFontReference(false)
-    , m_font(nsFont)
     , m_isHashTableDeletedValue(false)
 {
     ASSERT_ARG(nsFont, nsFont);
-
-    CGFontRef cgFont = 0;
-    loadFont(nsFont, size, m_font, cgFont);
-
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
-    // FIXME: Chromium: The following code isn't correct for the Chromium port since the sandbox might
-    // have blocked font loading, in which case we'll only have the real loaded font file after the call to loadFont().
-    {
-        CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(toCTFontRef(m_font));
-        m_isColorBitmapFont = traits & kCTFontColorGlyphsTrait;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
-        m_isCompositeFontReference = traits & kCTFontCompositeTrait;
-#endif
+    if (canLoadInProcess(nsFont)) {
+        m_typeface = adoptRef(SkCreateTypefaceFromCTFont(toCTFontRef(nsFont)));
+    } else {
+        // In process loading fails for cases where third party font manager software
+        // registers fonts in non system locations such as /Library/Fonts
+        // and ~/Library Fonts, see crbug.com/72727 or crbug.com/108645.
+        m_typeface = loadFromBrowserProcess(nsFont, size);
     }
-#endif
-
-    if (m_font)
-        CFRetain(m_font);
-
-    m_cgFont.adoptCF(cgFont);
-}
-
-void FontPlatformData::platformDataInit(const FontPlatformData& f)
-{
-    m_font = f.m_font ? [f.m_font retain] : f.m_font;
-
-    m_cgFont = f.m_cgFont;
-    m_CTFont = f.m_CTFont;
-
-    m_inMemoryFont = f.m_inMemoryFont;
-    m_harfBuzzFace = f.m_harfBuzzFace;
-    m_typeface = f.m_typeface;
 }
 
-const FontPlatformData& FontPlatformData::platformDataAssign(const FontPlatformData& f)
+bool FontPlatformData::defaultUseSubpixelPositioning()
 {
-    m_cgFont = f.m_cgFont;
-    if (m_font == f.m_font)
-        return *this;
-    if (f.m_font)
-        CFRetain(f.m_font);
-    if (m_font)
-        CFRelease(m_font);
-    m_font = f.m_font;
-    m_CTFont = f.m_CTFont;
-
-    m_inMemoryFont = f.m_inMemoryFont;
-    m_harfBuzzFace = f.m_harfBuzzFace;
-    m_typeface = f.m_typeface;
-
-    return *this;
-}
-
-
-void FontPlatformData::setFont(NSFont *font)
-{
-    ASSERT_ARG(font, font);
-
-    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 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;
-    }
-
-    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
-    }
-#endif
-    m_CTFont = nullptr;
+    return FontDescription::subpixelPositioning();
 }
 
-bool FontPlatformData::roundsGlyphAdvances() const
-{
-    return [m_font renderingMode] == NSFontAntialiasedIntegerAdvancementsRenderingMode;
-}
-
-bool FontPlatformData::allowsLigatures() const
-{
-    return ![[m_font coveredCharacterSet] characterIsMember:'a'];
-}
-
-static CFDictionaryRef createFeatureSettingDictionary(int featureTypeIdentifier, int featureSelectorIdentifier)
-{
-    RetainPtr<CFNumberRef> featureTypeIdentifierNumber(AdoptCF, CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &featureTypeIdentifier));
-    RetainPtr<CFNumberRef> featureSelectorIdentifierNumber(AdoptCF, CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &featureSelectorIdentifier));
-
-    const void* settingKeys[] = { kCTFontFeatureTypeIdentifierKey, kCTFontFeatureSelectorIdentifierKey };
-    const void* settingValues[] = { featureTypeIdentifierNumber.get(), featureSelectorIdentifierNumber.get() };
-
-    return CFDictionaryCreate(kCFAllocatorDefault, settingKeys, settingValues, WTF_ARRAY_LENGTH(settingKeys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
-}
-
-static CTFontDescriptorRef cascadeToLastResortFontDescriptor()
-{
-    static CTFontDescriptorRef descriptor;
-    if (descriptor)
-        return descriptor;
-
-    const void* keys[] = { kCTFontCascadeListAttribute };
-    const void* descriptors[] = { CTFontDescriptorCreateWithNameAndSize(CFSTR("LastResort"), 0) };
-    const void* values[] = { CFArrayCreate(kCFAllocatorDefault, descriptors, WTF_ARRAY_LENGTH(descriptors), &kCFTypeArrayCallBacks) };
-    RetainPtr<CFDictionaryRef> attributes(AdoptCF, CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
-
-    descriptor = CTFontDescriptorCreateWithAttributes(attributes.get());
-
-    return descriptor;
-}
-
-static CTFontDescriptorRef cascadeToLastResortAndDisableSwashesFontDescriptor()
-{
-    static CTFontDescriptorRef descriptor;
-    if (descriptor)
-        return descriptor;
-
-    RetainPtr<CFDictionaryRef> lineInitialSwashesOffSetting(AdoptCF, createFeatureSettingDictionary(kSmartSwashType, kLineInitialSwashesOffSelector));
-    RetainPtr<CFDictionaryRef> lineFinalSwashesOffSetting(AdoptCF, createFeatureSettingDictionary(kSmartSwashType, kLineFinalSwashesOffSelector));
-
-    const void* settingDictionaries[] = { lineInitialSwashesOffSetting.get(), lineFinalSwashesOffSetting.get() };
-    RetainPtr<CFArrayRef> featureSettings(AdoptCF, CFArrayCreate(kCFAllocatorDefault, settingDictionaries, WTF_ARRAY_LENGTH(settingDictionaries), &kCFTypeArrayCallBacks));
-
-    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;
-}
-
-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();
-    }
-
-    m_CTFont = toCTFontRef(m_font);
-    if (m_CTFont) {
-        CTFontDescriptorRef fontDescriptor;
-        RetainPtr<CFStringRef> postScriptName(AdoptCF, CTFontCopyPostScriptName(m_CTFont.get()));
-        // Hoefler Text Italic has line-initial and -final swashes enabled by default, so disable them.
-        if (CFEqual(postScriptName.get(), CFSTR("HoeflerText-Italic")) || CFEqual(postScriptName.get(), CFSTR("HoeflerText-BlackItalic")))
-            fontDescriptor = cascadeToLastResortAndDisableSwashesFontDescriptor();
-        else
-            fontDescriptor = cascadeToLastResortFontDescriptor();
-        m_CTFont.adoptCF(CTFontCreateCopyWithAttributes(m_CTFont.get(), m_textSize, 0, fontDescriptor));
-    } else
-        m_CTFont.adoptCF(CTFontCreateWithGraphicsFont(m_cgFont.get(), m_textSize, 0, cascadeToLastResortFontDescriptor()));
-
-    return m_CTFont.get();
-}
 
 } // namespace blink