webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 79 insertions, 20 deletions

diff --git a/Source/WebKit2/config.h b/Source/WebKit2/config.h
index c9238e98c..c63d1a26f 100644
--- a/Source/WebKit2/config.h
+++ b/Source/WebKit2/config.h
@@ -24,30 +24,18 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */ 
 
-#if defined(BUILDING_WITH_CMAKE)
+#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
 #include "cmakeconfig.h"
-#elif defined(BUILDING_GTK__)
-#include "autotoolsconfig.h"
 #endif
 
+#include <wtf/Platform.h>
+
+#include <WebCore/PlatformExportMacros.h>
 #include <runtime/JSExportMacros.h>
 #include <wtf/DisallowCType.h>
-#include <wtf/Platform.h>
 #include <wtf/ExportMacros.h>
 
 #ifdef __cplusplus
-#ifndef EXTERN_C_BEGIN
-#define EXTERN_C_BEGIN extern "C" {
-#endif
-#ifndef EXTERN_C_END
-#define EXTERN_C_END }
-#endif
-#else
-#define EXTERN_C_BEGIN
-#define EXTERN_C_END
-#endif
-
-#ifdef __cplusplus
 
 // These undefs match up with defines in WebKit2Prefix.h for Mac OS X.
 // Helps us catch if anyone uses new or delete by accident in code and doesn't include "config.h".
@@ -60,7 +48,7 @@
 #ifndef PLUGIN_ARCHITECTURE_UNSUPPORTED
 #if PLATFORM(MAC)
 #define PLUGIN_ARCHITECTURE_MAC 1
-#elif (PLATFORM(GTK) || PLATFORM(EFL)) && (OS(UNIX) && !OS(MAC_OS_X)) && PLATFORM(X11)
+#elif PLATFORM(GTK) && PLATFORM(X11) && OS(UNIX) && !OS(MAC_OS_X)
 #define PLUGIN_ARCHITECTURE_X11 1
 #else
 #define PLUGIN_ARCHITECTURE_UNSUPPORTED 1
@@ -70,19 +58,90 @@
 #define PLUGIN_ARCHITECTURE(ARCH) (defined PLUGIN_ARCHITECTURE_##ARCH && PLUGIN_ARCHITECTURE_##ARCH)
 
 #ifndef ENABLE_INSPECTOR_SERVER
-#if ENABLE(INSPECTOR) && (PLATFORM(GTK) || PLATFORM(EFL))
+#if ENABLE(WEB_SOCKETS) && PLATFORM(GTK)
 #define ENABLE_INSPECTOR_SERVER 1
 #endif
 #endif
 
 #ifndef ENABLE_SEC_ITEM_SHIM
-#if PLATFORM(MAC) && !PLATFORM(IOS)
+#if PLATFORM(MAC) || PLATFORM(IOS)
 #define ENABLE_SEC_ITEM_SHIM 1
 #endif
 #endif
 
+#if PLATFORM(MAC)
 #ifndef HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS
-#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
 #define HAVE_WINDOW_SERVER_OCCLUSION_NOTIFICATIONS 1
 #endif
 #endif
+
+#if USE(CFURLCONNECTION)
+#ifndef USE_NETWORK_SESSION
+#define USE_NETWORK_SESSION 0
+#endif
+#endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) \
+    || (PLATFORM(IOS) && TARGET_OS_IOS && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000) \
+    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 100000) \
+    || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 30000) \
+    || USE(SOUP)
+#ifndef USE_NETWORK_SESSION
+#define USE_NETWORK_SESSION 1
+#endif
+
+// FIXME: We should work towards not using CredentialStorage in WebKit2 to not have problems with digest authentication.
+#ifndef USE_CREDENTIAL_STORAGE_WITH_NETWORK_SESSION
+#define USE_CREDENTIAL_STORAGE_WITH_NETWORK_SESSION 1
+#endif
+#endif
+
+#ifndef HAVE_SEC_ACCESS_CONTROL
+#if PLATFORM(IOS) || PLATFORM(MAC)
+#define HAVE_SEC_ACCESS_CONTROL 1
+#endif
+#endif
+
+#ifndef HAVE_OS_ACTIVITY
+#if PLATFORM(IOS) || PLATFORM(MAC)
+#define HAVE_OS_ACTIVITY 1
+#endif
+#endif
+
+#ifndef ENABLE_NETWORK_CACHE
+#if PLATFORM(COCOA) || USE(SOUP)
+#define ENABLE_NETWORK_CACHE 1
+#else
+#define ENABLE_NETWORK_CACHE 0
+#endif
+#endif
+
+#ifndef ENABLE_NETWORK_CAPTURE
+#if USE(NETWORK_SESSION) && PLATFORM(COCOA)
+#define ENABLE_NETWORK_CAPTURE 1
+#endif
+#endif
+
+#ifndef ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION
+#if ENABLE(NETWORK_CACHE) && (PLATFORM(COCOA) || PLATFORM(GTK))
+#define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 1
+#else
+#define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 0
+#endif
+#endif
+
+#ifndef HAVE_SAFARI_SERVICES_FRAMEWORK
+#if PLATFORM(IOS) && (!defined TARGET_OS_IOS || TARGET_OS_IOS)
+#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