Changeset 239034 in webkit

Timestamp:

Dec 10, 2018, 9:55:34 AM (6 years ago)

Author:

ap@apple.com

Message:

Move more macros out of WebKit's config.h
​https://bugs.webkit.org/show_bug.cgi?id=192430

Reviewed by Tim Horton.

Source/WebKit:

• config.h:

Source/WTF:

• wtf/Platform.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/config.h (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-12-10  Alexey Proskuryakov  <ap@apple.com>
+
+        Move more macros out of WebKit's config.h
+        https://bugs.webkit.org/show_bug.cgi?id=192430
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h:
+
 2018-12-09  Yusuke Suzuki  <yusukesuzuki@slowstart.org>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1428 +1428 @@
 #define USE_NEW_THEME 1
 #endif
+
+#if PLATFORM(MAC)
+#define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS 1
+#endif
+
+#if PLATFORM(COCOA)
+#define HAVE_SEC_ACCESS_CONTROL 1
+#endif
+
+#if PLATFORM(IOS)
+/* FIXME: SafariServices.framework exists on macOS. It is only used by WebKit on iOS, so the behavior is correct, but the name is misleading. */
+#define HAVE_SAFARI_SERVICES_FRAMEWORK 1
+#endif
+
+#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || PLATFORM(IOS)) && !defined(__i386__)
+#define HAVE_SAFE_BROWSING 1
+#endif
+
+#if PLATFORM(IOS)
+#define HAVE_LINK_PREVIEW 1
+#endif

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-10  Alexey Proskuryakov  <ap@apple.com>
+
+        Move more macros out of WebKit's config.h
+        https://bugs.webkit.org/show_bug.cgi?id=192430
+
+        Reviewed by Tim Horton.
+
+        * config.h:
+
 2018-12-10  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebKit/config.h

@@ -67 +67 @@
 #endif
 
-#if PLATFORM(MAC)
-#ifndef HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS
-#define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS 1
-#endif
-#endif
-
 // FIXME: We should work towards not using CredentialStorage in WebKit to not have problems with digest authentication.
 #ifndef USE_CREDENTIAL_STORAGE_WITH_NETWORK_SESSION
@@ -84 +78 @@
 #endif
 
-#ifndef HAVE_SEC_ACCESS_CONTROL
-#if PLATFORM(IOS_FAMILY) || PLATFORM(MAC)
-#define HAVE_SEC_ACCESS_CONTROL 1
-#endif
-#endif
-
 #ifndef ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION
 #if (PLATFORM(COCOA) || PLATFORM(GTK))
@@ -98 +86 @@
 #endif
 
-#ifndef HAVE_SAFARI_SERVICES_FRAMEWORK
-#if PLATFORM(IOS_FAMILY) && (!defined TARGET_OS_IOS || TARGET_OS_IOS) && !PLATFORM(IOSMAC)
-#define HAVE_SAFARI_SERVICES_FRAMEWORK 1
-#else
-#define HAVE_SAFARI_SERVICES_FRAMEWORK 0
-#endif
-#endif
-
-#ifndef HAVE_LINK_PREVIEW
-#if defined TARGET_OS_IOS && TARGET_OS_IOS
-#define HAVE_LINK_PREVIEW 1
-#else
-#define HAVE_LINK_PREVIEW 0
-#endif
-#endif
-
-#if ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)) && !defined(__i386__) && !PLATFORM(IOSMAC)
-#define HAVE_SAFE_BROWSING 1
-#else
-#define HAVE_SAFE_BROWSING 0
-#endif
-
 #ifndef ENABLE_HTTPS_UPGRADE
 #define ENABLE_HTTPS_UPGRADE 0