Title: [229062] trunk/Source/WebCore
- Revision
- 229062
- Author
- wenson_hs...@apple.com
- Date
- 2018-02-27 08:43:22 -0800 (Tue, 27 Feb 2018)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (229061 => 229062)
--- trunk/Source/WebCore/ChangeLog 2018-02-27 16:39:11 UTC (rev 229061)
+++ trunk/Source/WebCore/ChangeLog 2018-02-27 16:43:22 UTC (rev 229062)
@@ -1,3 +1,14 @@
+2018-02-27 Wenson Hsieh <wenson_hs...@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 <mc...@redhat.com>
Potential privacy issue: DNS prefetching can be re-enabled
Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (229061 => 229062)
--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-02-27 16:39:11 UTC (rev 229061)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2018-02-27 16:43:22 UTC (rev 229062)
@@ -1473,8 +1473,8 @@
}
#else
UNUSED_PARAM(allowUserInstalledFonts);
+#endif
return nullptr;
-#endif
}
Ref<Font> FontCache::lastResortFallbackFont(const FontDescription& fontDescription)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
