Index: third_party/harfbuzz-ng/src/hb-coretext.cc |
diff --git a/third_party/harfbuzz-ng/src/hb-coretext.cc b/third_party/harfbuzz-ng/src/hb-coretext.cc |
index f4d9716e9e3a6ed64d8265c3e1cd46c72d6ab485..4ae167198754c604db4a12da511706ca5e1f4a35 100644 |
--- a/third_party/harfbuzz-ng/src/hb-coretext.cc |
+++ b/third_party/harfbuzz-ng/src/hb-coretext.cc |
@@ -145,6 +145,14 @@ create_ct_font (CGFontRef cg_font, CGFloat font_size) |
DEBUG_MSG (CORETEXT, cg_font, "Font CTFontCreateWithGraphicsFont() failed"); |
return NULL; |
} |
+ |
+ /* crbug.com/576941 and crbug.com/625902 and the investigation in the latter |
+ * bug indicate that the cascade list reconfiguration occasionally causes |
+ * crashes in CoreText on OS X 10.9, thus let's skip this step on older |
+ * operating system versions. */ |
+ if (&CTGetCoreTextVersion != NULL && CTGetCoreTextVersion() <= kCTVersionNumber10_9) |
Robert Sesek
2016/07/22 15:56:11
This still crashes for me, so I added some logging
|
+ return ct_font; |
+ |
CFURLRef original_url = (CFURLRef)CTFontCopyAttribute(ct_font, kCTFontURLAttribute); |
/* Create font copy with cascade list that has LastResort first; this speeds up CoreText |