Modified: branches/safari-606-branch/Source/WebCore/ChangeLog (234161 => 234162)
--- branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-24 19:28:41 UTC (rev 234161)
+++ branches/safari-606-branch/Source/WebCore/ChangeLog 2018-07-24 19:29:47 UTC (rev 234162)
@@ -1,3 +1,39 @@
+2018-07-24 Babak Shafiei <[email protected]>
+
+ Cherry-pick r234158. rdar://problem/42551556
+
+ [Cocoa] Stop crashing in lastResortFallbackFont()
+ https://bugs.webkit.org/show_bug.cgi?id=187936
+
+ Reviewed by Jon Lee.
+
+ CoreText can get into a state where both Times and Lucida Grande are inaccessible.
+ Instead of crashing, we should use the real LastResort, which is backed by a section
+ in the .rodata of the CoreText dylib, and as such should always exist.
+
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::fontForFamily):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::FontCache::lastResortFallbackFont):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234158 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-07-24 Myles C. Maxfield <[email protected]>
+
+ [Cocoa] Stop crashing in lastResortFallbackFont()
+ https://bugs.webkit.org/show_bug.cgi?id=187936
+
+ Reviewed by Jon Lee.
+
+ CoreText can get into a state where both Times and Lucida Grande are inaccessible.
+ Instead of crashing, we should use the real LastResort, which is backed by a section
+ in the .rodata of the CoreText dylib, and as such should always exist.
+
+ * platform/graphics/FontCache.cpp:
+ (WebCore::FontCache::fontForFamily):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::FontCache::lastResortFallbackFont):
+
2018-07-23 Babak Shafiei <[email protected]>
Cherry-pick r234073. rdar://problem/42451644
Modified: branches/safari-606-branch/Source/WebCore/platform/graphics/FontCache.cpp (234161 => 234162)
--- branches/safari-606-branch/Source/WebCore/platform/graphics/FontCache.cpp 2018-07-24 19:28:41 UTC (rev 234161)
+++ branches/safari-606-branch/Source/WebCore/platform/graphics/FontCache.cpp 2018-07-24 19:29:47 UTC (rev 234162)
@@ -324,11 +324,10 @@
if (!m_purgeTimer.isActive())
m_purgeTimer.startOneShot(0_s);
- FontPlatformData* platformData = getCachedFontPlatformData(fontDescription, family, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, checkingAlternateName);
- if (!platformData)
- return nullptr;
+ if (auto* platformData = getCachedFontPlatformData(fontDescription, family, fontFaceFeatures, fontFaceVariantSettings, fontFaceCapabilities, checkingAlternateName))
+ return fontForPlatformData(*platformData);
- return fontForPlatformData(*platformData);
+ return nullptr;
}
Ref<Font> FontCache::fontForPlatformData(const FontPlatformData& platformData)
Modified: branches/safari-606-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (234161 => 234162)
--- branches/safari-606-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-07-24 19:28:41 UTC (rev 234161)
+++ branches/safari-606-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-07-24 19:29:47 UTC (rev 234162)
@@ -1481,14 +1481,27 @@
{
// FIXME: Would be even better to somehow get the user's default font here. For now we'll pick
// the default that the user would get without changing any prefs.
- if (RefPtr<Font> font = fontForFamily(fontDescription, AtomicString("Times", AtomicString::ConstructFromLiteral)))
- return *font;
+ if (auto result = fontForFamily(fontDescription, AtomicString("Times", AtomicString::ConstructFromLiteral)))
+ return *result;
// The Times fallback will almost always work, but in the highly unusual case where
- // the user doesn't have it, we fall back on Lucida Grande because that's
- // guaranteed to be there, according to Nathan Taylor. This is good enough
- // to avoid a crash at least.
- return *fontForFamily(fontDescription, AtomicString("Lucida Grande", AtomicString::ConstructFromLiteral), nullptr, nullptr, { }, false);
+ // the user doesn't have it, we fall back on Lucida Grande.
+ if (auto result = fontForFamily(fontDescription, AtomicString("Lucida Grande", AtomicString::ConstructFromLiteral), nullptr, nullptr, { }, false))
+ return *result;
+
+ // LastResort is guaranteed to be non-null.
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300)
+ auto fontDescriptor = adoptCF(CTFontDescriptorCreateLastResort());
+ auto font = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), fontDescription.computedPixelSize(), nullptr));
+#else
+ // Even if Helvetica doesn't exist, CTFontCreateWithName will return
+ // a thin wrapper around a GraphicsFont which represents LastResort.
+ auto font = adoptCF(CTFontCreateWithName(CFSTR("Helvetica"), fontDescription.computedPixelSize(), nullptr));
+#endif
+ bool syntheticBold, syntheticOblique;
+ std::tie(syntheticBold, syntheticOblique) = computeNecessarySynthesis(font.get(), fontDescription).boldObliquePair();
+ FontPlatformData platformData(font.get(), fontDescription.computedPixelSize(), syntheticBold, syntheticOblique, fontDescription.orientation(), fontDescription.widthVariant(), fontDescription.textRenderingMode());
+ return fontForPlatformData(platformData);
}
}
