Title: [239034] trunk/Source
- Revision
- 239034
- Author
- [email protected]
- Date
- 2018-12-10 09:55:34 -0800 (Mon, 10 Dec 2018)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (239033 => 239034)
--- trunk/Source/WTF/ChangeLog 2018-12-10 17:51:08 UTC (rev 239033)
+++ trunk/Source/WTF/ChangeLog 2018-12-10 17:55:34 UTC (rev 239034)
@@ -1,3 +1,12 @@
+2018-12-10 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, fix build failure on GCC 8.2, part 2
Modified: trunk/Source/WTF/wtf/Platform.h (239033 => 239034)
--- trunk/Source/WTF/wtf/Platform.h 2018-12-10 17:51:08 UTC (rev 239033)
+++ trunk/Source/WTF/wtf/Platform.h 2018-12-10 17:55:34 UTC (rev 239034)
@@ -1427,3 +1427,24 @@
/* FIXME: This really needs a descriptive name, this "new theme" was added in 2008. */
#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
Modified: trunk/Source/WebKit/ChangeLog (239033 => 239034)
--- trunk/Source/WebKit/ChangeLog 2018-12-10 17:51:08 UTC (rev 239033)
+++ trunk/Source/WebKit/ChangeLog 2018-12-10 17:55:34 UTC (rev 239034)
@@ -1,3 +1,12 @@
+2018-12-10 Alexey Proskuryakov <[email protected]>
+
+ 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 <[email protected]>
[meta][WebKit] Remove using namespace WebCore and WebKit in the global scope for unified source builds
Modified: trunk/Source/WebKit/config.h (239033 => 239034)
--- trunk/Source/WebKit/config.h 2018-12-10 17:51:08 UTC (rev 239033)
+++ trunk/Source/WebKit/config.h 2018-12-10 17:55:34 UTC (rev 239034)
@@ -66,12 +66,6 @@
#endif
#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
#define USE_CREDENTIAL_STORAGE_WITH_NETWORK_SESSION 1
@@ -83,12 +77,6 @@
#endif
#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))
#define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 1
@@ -97,28 +85,6 @@
#endif
#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
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
