Unreviewed, fix the debug build after r228877.
authorwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Feb 2018 16:43:22 +0000 (16:43 +0000)
committerwenson_hsieh@apple.com <wenson_hsieh@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 27 Feb 2018 16:43:22 +0000 (16:43 +0000)
In the case where CAN_DISALLOW_USER_INSTALLED_FONTS is enabled, this function doesn't return anything when
allowUserInstalledFonts != AllowUserInstalledFonts::No. Fix the build by moving `return nullptr;` back out of
the `#else`.

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

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

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

index d8e4f88..012d44c 100644 (file)
@@ -1,3 +1,14 @@
+2018-02-27  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Unreviewed, fix the debug build after r228877.
+
+        In the case where CAN_DISALLOW_USER_INSTALLED_FONTS is enabled, this function doesn't return anything when
+        allowUserInstalledFonts != AllowUserInstalledFonts::No. Fix the build by moving `return nullptr;` back out of
+        the `#else`.
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+        (WebCore::installedFontMandatoryAttributes):
+
 2018-02-27  Milan Crha  <mcrha@redhat.com>
 
         Potential privacy issue: DNS prefetching can be re-enabled
index 49de822..b2a6a95 100644 (file)
@@ -1473,8 +1473,8 @@ RetainPtr<CFSetRef> installedFontMandatoryAttributes(AllowUserInstalledFonts all
     }
 #else
     UNUSED_PARAM(allowUserInstalledFonts);
-    return nullptr;
 #endif
+    return nullptr;
 }
 
 Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescription)