Tweak availability macros for CAN_DISALLOW_USER_INSTALLED_FONTS
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Feb 2018 22:39:10 +0000 (22:39 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 3 Feb 2018 22:39:10 +0000 (22:39 +0000)
Rubber-stamped by Maciej Stachowiak.

* platform/graphics/cocoa/FontCacheCoreText.cpp:

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

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

index 5d158a1..34a5bae 100644 (file)
@@ -1,3 +1,11 @@
+2018-02-03  Alexey Proskuryakov  <ap@apple.com>
+
+        Tweak availability macros for CAN_DISALLOW_USER_INSTALLED_FONTS
+
+        Rubber-stamped by Maciej Stachowiak.
+
+        * platform/graphics/cocoa/FontCacheCoreText.cpp:
+
 2018-02-02  Daniel Bates  <dabates@apple.com>
 
         Clean up FrameLoader::receivedFirstData()
 2018-02-02  Daniel Bates  <dabates@apple.com>
 
         Clean up FrameLoader::receivedFirstData()
index cdf595d..89227e7 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))
 #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 ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400))
+#define CAN_DISALLOW_USER_INSTALLED_FONTS ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
 
 namespace WebCore {
 
 
 namespace WebCore {