Attempted mitigation of font tables released early.
On Mac, it appears that sometimes fonts created from data have
their table data used after the table data copy is freed.
This appears to be most common with 'sbix' fonts for some reason,
so pin that table while in use.
Review URL: https://codereview.chromium.org/1061123002
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 5be7cc1..836576b 100755
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -453,14 +453,15 @@
: SkTypeface(fs, fontID, isFixedPitch)
, fRequestedName(requestedName)
, fFontRef(fontRef) // caller has already called CFRetain for us
+ , fHasColorGlyphs(SkToBool(CTFontGetSymbolicTraits(fFontRef) & SkCTFontColorGlyphsTrait))
, fIsLocalStream(isLocalStream)
- , fHasColorGlyphs(CTFontGetSymbolicTraits(fFontRef) & SkCTFontColorGlyphsTrait)
{
SkASSERT(fontRef);
}
SkString fRequestedName;
AutoCFRelease<CTFontRef> fFontRef;
+ const bool fHasColorGlyphs;
protected:
int onGetUPEM() const override;
@@ -482,7 +483,6 @@
private:
bool fIsLocalStream;
- bool fHasColorGlyphs;
typedef SkTypeface INHERITED;
};
@@ -907,6 +907,13 @@
// So always make the font transform identity and place the transform on the context.
point = CGPointApplyAffineTransform(point, context.fInvTransform);
+ // Attempt to keep on the stack a hard reference to the font tables.
+ // This is an experiment to see if this affects crbug.com/413332 .
+ // When 10.6 headers are no longer supported, 'sbix' can be replaced with kCTFontTableSbix.
+ AutoCFRelease<CFDataRef> sbix;
+ if (static_cast<SkTypeface_Mac*>(context.getTypeface())->fHasColorGlyphs) {
+ sbix.reset(CGFontCopyTableForTag(context.fCGFont, 'sbix'));
+ }
ctFontDrawGlyphs(context.fCTUnrotatedFont, &glyphID, &point, 1, fCG);
SkASSERT(rowBytesPtr);