[Cocoa] Allow user-installed fonts to be disabled
authormmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Mar 2018 03:06:06 +0000 (03:06 +0000)
committermmaxfield@apple.com <mmaxfield@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Mar 2018 03:06:06 +0000 (03:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=183349

Rubber stamped by Brent Fulgham.

Tests: fast/text/user-installed-font.html
       fast/text/user-installed-fonts/disable.html
       fast/text/user-installed-fonts/shadow-disable.html
       fast/text/user-installed-fonts/shadow-family-disable.html
       fast/text/user-installed-fonts/shadow-family.html
       fast/text/user-installed-fonts/shadow-postscript-disable.html
       fast/text/user-installed-fonts/shadow-postscript-family-disable.html
       fast/text/user-installed-fonts/shadow-postscript-family.html
       fast/text/user-installed-fonts/shadow-postscript.html
       fast/text/user-installed-fonts/shadow.html
       fast/text/user-installed-fonts/system-ui.html

* platform/graphics/cocoa/FontCacheCoreText.cpp:

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

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

index 311bc59..607fa43 100644 (file)
@@ -1,5 +1,26 @@
 2018-03-05  Myles C. Maxfield  <mmaxfield@apple.com>
 
+        [Cocoa] Allow user-installed fonts to be disabled
+        https://bugs.webkit.org/show_bug.cgi?id=183349
+
+        Rubber stamped by Brent Fulgham.
+
+        Tests: fast/text/user-installed-font.html
+               fast/text/user-installed-fonts/disable.html
+               fast/text/user-installed-fonts/shadow-disable.html
+               fast/text/user-installed-fonts/shadow-family-disable.html
+               fast/text/user-installed-fonts/shadow-family.html
+               fast/text/user-installed-fonts/shadow-postscript-disable.html
+               fast/text/user-installed-fonts/shadow-postscript-family-disable.html
+               fast/text/user-installed-fonts/shadow-postscript-family.html
+               fast/text/user-installed-fonts/shadow-postscript.html
+               fast/text/user-installed-fonts/shadow.html
+               fast/text/user-installed-fonts/system-ui.html
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+
+2018-03-05  Myles C. Maxfield  <mmaxfield@apple.com>
+
         Silence OpenGL and OpenGL ES deprecation warnings in newer SDKs
         https://bugs.webkit.org/show_bug.cgi?id=183350
 
index 597d8eb..c4f9946 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/NeverDestroyed.h>
 
 #define HAS_CORE_TEXT_WIDTH_ATTRIBUTE ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000))
-#define CAN_DISALLOW_USER_INSTALLED_FONTS 0
+#define CAN_DISALLOW_USER_INSTALLED_FONTS ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000))
 
 namespace WebCore {