Remove compile guard around beacon API
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Jan 2018 21:32:39 +0000 (21:32 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Jan 2018 21:32:39 +0000 (21:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182002

Reviewed by Sam Weinig.

It's enabled everywhere now.

* Shared/WebPreferences.yaml:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetBeaconAPIEnabled):
(WKPreferencesGetBeaconAPIEnabled):
* config.h:

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

Source/WebKit/ChangeLog
Source/WebKit/Shared/WebPreferences.yaml
Source/WebKit/UIProcess/API/C/WKPreferences.cpp
Source/WebKit/config.h

index 36d1c50..87bd699 100644 (file)
@@ -1,5 +1,20 @@
 2018-01-23  Alex Christensen  <achristensen@webkit.org>
 
+        Remove compile guard around beacon API
+        https://bugs.webkit.org/show_bug.cgi?id=182002
+
+        Reviewed by Sam Weinig.
+
+        It's enabled everywhere now.
+
+        * Shared/WebPreferences.yaml:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetBeaconAPIEnabled):
+        (WKPreferencesGetBeaconAPIEnabled):
+        * config.h:
+
+2018-01-23  Alex Christensen  <achristensen@webkit.org>
+
         Remove unused QTKit preference
         https://bugs.webkit.org/show_bug.cgi?id=181968
 
index fe32008..d3187af 100644 (file)
@@ -733,7 +733,6 @@ BeaconAPIEnabled:
   defaultValue: true
   humanReadableName: "Beacon API"
   humanReadableDescription: "Beacon API"
-  condition: ENABLE(BEACON_API)
 
 LegacyEncryptedMediaAPIEnabled:
   type: bool
index 1180627..03b8e43 100644 (file)
@@ -826,18 +826,12 @@ bool WKPreferencesGetInlineMediaPlaybackRequiresPlaysInlineAttribute(WKPreferenc
 
 void WKPreferencesSetBeaconAPIEnabled(WKPreferencesRef preferencesRef, bool flag)
 {
-#if ENABLE(BEACON_API)
     toImpl(preferencesRef)->setBeaconAPIEnabled(flag);
-#endif
 }
 
 bool WKPreferencesGetBeaconAPIEnabled(WKPreferencesRef preferencesRef)
 {
-#if ENABLE(BEACON_API)
     return toImpl(preferencesRef)->beaconAPIEnabled();
-#else
-    return false;
-#endif
 }
 
 void WKPreferencesSetDirectoryUploadEnabled(WKPreferencesRef preferencesRef, bool flag)
index abf7727..c0ecdf5 100644 (file)
 #endif
 #endif
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || PLATFORM(IOS) || PLATFORM(APPLETV) || PLATFORM(WATCHOS) || USE(SOUP)
-#ifndef ENABLE_BEACON_API
-#define ENABLE_BEACON_API 1
-#endif
-
-// FIXME: We should work towards not using CredentialStorage in WebKit2 to not have problems with digest authentication.
+// 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
 #endif
-#endif
 
 #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
 #ifndef ENABLE_SERVER_PRECONNECT