[Cocoa] Addressing post-review comments on r234158
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Aug 2018 02:29:23 +0000 (02:29 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Aug 2018 02:29:23 +0000 (02:29 +0000)
https://bugs.webkit.org/show_bug.cgi?id=188202

Reviewed by Darin Adler.

* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::FontCache::lastResortFallbackFont):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

index ef572ec..87b34c3 100644 (file)
@@ -1,3 +1,13 @@
+2018-07-31  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [Cocoa] Addressing post-review comments on r234158
+        https://bugs.webkit.org/show_bug.cgi?id=188202
+
+        Reviewed by Darin Adler.
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::FontCache::lastResortFallbackFont):
+
 2018-07-31  John Wilander  <wilander@apple.com>
 
         Resource Load Statistics: Remove partitioned cookies for reduced complexity, lower memory footprint, and ability to support more platforms
index 63014e2..c481020 100644 (file)
@@ -1484,11 +1484,6 @@ Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescripti
     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.
-    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());