Title: [203195] trunk/Source/WebKit2
- Revision
- 203195
- Author
- [email protected]
- Date
- 2016-07-13 15:40:49 -0700 (Wed, 13 Jul 2016)
Log Message
Move WKPreferencesRef functions to the correct file
https://bugs.webkit.org/show_bug.cgi?id=159741
Reviewed by Sam Weinig.
Also, get rid of WKPreferencesGetPaymentsEnabled and WKPreferencesSetPaymentsEnabled.
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesGetApplePayEnabled):
(WKPreferencesSetApplePayEnabled):
(WKPreferencesGetApplePayCapabilityDisclosureAllowed):
(WKPreferencesSetApplePayCapabilityDisclosureAllowed):
* UIProcess/API/C/WKPreferencesRef.h:
* UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm:
(WKPreferencesGetApplePayEnabled): Deleted.
(WKPreferencesSetApplePayEnabled): Deleted.
(WKPreferencesGetApplePayCapabilityDisclosureAllowed): Deleted.
(WKPreferencesSetApplePayCapabilityDisclosureAllowed): Deleted.
(WKPreferencesGetPaymentsEnabled): Deleted.
(WKPreferencesSetPaymentsEnabled): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (203194 => 203195)
--- trunk/Source/WebKit2/ChangeLog 2016-07-13 22:18:32 UTC (rev 203194)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-13 22:40:49 UTC (rev 203195)
@@ -1,5 +1,28 @@
2016-07-13 Anders Carlsson <[email protected]>
+ Move WKPreferencesRef functions to the correct file
+ https://bugs.webkit.org/show_bug.cgi?id=159741
+
+ Reviewed by Sam Weinig.
+
+ Also, get rid of WKPreferencesGetPaymentsEnabled and WKPreferencesSetPaymentsEnabled.
+
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesGetApplePayEnabled):
+ (WKPreferencesSetApplePayEnabled):
+ (WKPreferencesGetApplePayCapabilityDisclosureAllowed):
+ (WKPreferencesSetApplePayCapabilityDisclosureAllowed):
+ * UIProcess/API/C/WKPreferencesRef.h:
+ * UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm:
+ (WKPreferencesGetApplePayEnabled): Deleted.
+ (WKPreferencesSetApplePayEnabled): Deleted.
+ (WKPreferencesGetApplePayCapabilityDisclosureAllowed): Deleted.
+ (WKPreferencesSetApplePayCapabilityDisclosureAllowed): Deleted.
+ (WKPreferencesGetPaymentsEnabled): Deleted.
+ (WKPreferencesSetPaymentsEnabled): Deleted.
+
+2016-07-13 Anders Carlsson <[email protected]>
+
Add _applePayCapabilityDisclosureAllowed SPI declaration
https://bugs.webkit.org/show_bug.cgi?id=159740
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (203194 => 203195)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-13 22:18:32 UTC (rev 203194)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2016-07-13 22:40:49 UTC (rev 203195)
@@ -1531,3 +1531,23 @@
{
return toImpl(preferencesRef)->allowsPictureInPictureMediaPlayback();
}
+
+WK_EXPORT bool WKPreferencesGetApplePayEnabled(WKPreferencesRef preferencesRef)
+{
+ return WebKit::toImpl(preferencesRef)->applePayEnabled();
+}
+
+void WKPreferencesSetApplePayEnabled(WKPreferencesRef preferencesRef, bool enabled)
+{
+ WebKit::toImpl(preferencesRef)->setApplePayEnabled(enabled);
+}
+
+bool WKPreferencesGetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef)
+{
+ return WebKit::toImpl(preferencesRef)->applePayCapabilityDisclosureAllowed();
+}
+
+void WKPreferencesSetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef, bool allowed)
+{
+ WebKit::toImpl(preferencesRef)->setApplePayCapabilityDisclosureAllowed(allowed);
+}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h (203194 => 203195)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2016-07-13 22:18:32 UTC (rev 203194)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesRef.h 2016-07-13 22:40:49 UTC (rev 203195)
@@ -276,6 +276,14 @@
WK_EXPORT void WKPreferencesSetUserInterfaceDirectionPolicy(WKPreferencesRef preferencesRef, _WKUserInterfaceDirectionPolicy userInterfaceDirectionPolicy);
WK_EXPORT _WKUserInterfaceDirectionPolicy WKPreferencesGetUserInterfaceDirectionPolicy(WKPreferencesRef preferencesRef);
+// Defaults to false.
+WK_EXPORT bool WKPreferencesGetApplePayEnabled(WKPreferencesRef preferencesRef);
+WK_EXPORT void WKPreferencesSetApplePayEnabled(WKPreferencesRef preferencesRef, bool enabled);
+
+// Defaults to true.
+WK_EXPORT bool WKPreferencesGetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef);
+WK_EXPORT void WKPreferencesSetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef, bool allowed);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm (203194 => 203195)
--- trunk/Source/WebKit2/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm 2016-07-13 22:18:32 UTC (rev 203194)
+++ trunk/Source/WebKit2/UIProcess/ApplePay/mac/WebPaymentCoordinatorProxyMac.mm 2016-07-13 22:40:49 UTC (rev 203195)
@@ -109,45 +109,4 @@
}
-extern "C" {
-WK_EXPORT bool WKPreferencesGetApplePayEnabled(WKPreferencesRef preferencesRef);
-WK_EXPORT void WKPreferencesSetApplePayEnabled(WKPreferencesRef preferencesRef, bool enabled);
-
-WK_EXPORT bool WKPreferencesGetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef);
-WK_EXPORT void WKPreferencesSetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef, bool allowed);
-
-// FIXME: Get rid of these in favor of the ones that mention Apple Pay.
-WK_EXPORT bool WKPreferencesGetPaymentsEnabled(WKPreferencesRef preferencesRef);
-WK_EXPORT void WKPreferencesSetPaymentsEnabled(WKPreferencesRef preferencesRef, bool enabled);
-}
-
-WK_EXPORT bool WKPreferencesGetApplePayEnabled(WKPreferencesRef preferencesRef)
-{
- return WebKit::toImpl(preferencesRef)->applePayEnabled();
-}
-
-void WKPreferencesSetApplePayEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- WebKit::toImpl(preferencesRef)->setApplePayEnabled(enabled);
-}
-
-bool WKPreferencesGetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef)
-{
- return WebKit::toImpl(preferencesRef)->applePayCapabilityDisclosureAllowed();
-}
-
-void WKPreferencesSetApplePayCapabilityDisclosureAllowed(WKPreferencesRef preferencesRef, bool allowed)
-{
- WebKit::toImpl(preferencesRef)->setApplePayCapabilityDisclosureAllowed(allowed);
-}
-
-bool WKPreferencesGetPaymentsEnabled(WKPreferencesRef preferencesRef)
-{
- return WKPreferencesGetApplePayEnabled(preferencesRef);
-}
-
-void WKPreferencesSetPaymentsEnabled(WKPreferencesRef preferencesRef, bool enabled)
-{
- WKPreferencesSetApplePayEnabled(preferencesRef, enabled);
-}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
