Title: [224043] trunk
- Revision
- 224043
- Author
- [email protected]
- Date
- 2017-10-26 13:20:42 -0700 (Thu, 26 Oct 2017)
Log Message
[Payment Request] Enable Payment Request whenever Apple Pay is enabled
https://bugs.webkit.org/show_bug.cgi?id=178880
Reviewed by Tim Horton.
Source/WebKit:
* Shared/WebPreferences.yaml:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetPaymentRequestEnabled): Deleted.
(WKPreferencesGetPaymentRequestEnabled): Deleted.
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetPreferencesToConsistentValues):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (224042 => 224043)
--- trunk/Source/WebKit/ChangeLog 2017-10-26 20:17:36 UTC (rev 224042)
+++ trunk/Source/WebKit/ChangeLog 2017-10-26 20:20:42 UTC (rev 224043)
@@ -1,3 +1,18 @@
+2017-10-26 Andy Estes <[email protected]>
+
+ [Payment Request] Enable Payment Request whenever Apple Pay is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=178880
+
+ Reviewed by Tim Horton.
+
+ * Shared/WebPreferences.yaml:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetPaymentRequestEnabled): Deleted.
+ (WKPreferencesGetPaymentRequestEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRefPrivate.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
2017-10-26 Chris Dumez <[email protected]>
Bring back SWContextManager abstraction in WebCore
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (224042 => 224043)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2017-10-26 20:17:36 UTC (rev 224042)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2017-10-26 20:20:42 UTC (rev 224043)
@@ -950,13 +950,6 @@
humanReadableDescription: "Link preload support"
category: experimental
-PaymentRequestEnabled:
- type: bool
- defaultValue: false
- humanReadableName: "Payment Request"
- humanReadableDescription: "W3C Payment Request API"
- category: experimental
-
WebRTCLegacyAPIDisabled:
type: bool
defaultValue: DEFAULT_EXPERIMENTAL_FEATURES_ENABLED
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (224042 => 224043)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2017-10-26 20:17:36 UTC (rev 224042)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2017-10-26 20:20:42 UTC (rev 224043)
@@ -1890,16 +1890,6 @@
return toImpl(preferencesRef)->inspectorAdditionsEnabled();
}
-void WKPreferencesSetPaymentRequestEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
- toImpl(preferencesRef)->setPaymentRequestEnabled(flag);
-}
-
-bool WKPreferencesGetPaymentRequestEnabled(WKPreferencesRef preferencesRef)
-{
- return toImpl(preferencesRef)->paymentRequestEnabled();
-}
-
void WKPreferencesSetStorageAccessAPIEnabled(WKPreferencesRef preferencesRef, bool flag)
{
toImpl(preferencesRef)->setStorageAccessAPIEnabled(flag);
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h (224042 => 224043)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-10-26 20:17:36 UTC (rev 224042)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRefPrivate.h 2017-10-26 20:20:42 UTC (rev 224043)
@@ -534,10 +534,6 @@
WK_EXPORT bool WKPreferencesGetInspectorAdditionsEnabled(WKPreferencesRef);
// Defaults to false.
-WK_EXPORT void WKPreferencesSetPaymentRequestEnabled(WKPreferencesRef, bool flag);
-WK_EXPORT bool WKPreferencesGetPaymentRequestEnabled(WKPreferencesRef);
-
-// Defaults to false.
WK_EXPORT void WKPreferencesSetStorageAccessAPIEnabled(WKPreferencesRef, bool flag);
WK_EXPORT bool WKPreferencesGetStorageAccessAPIEnabled(WKPreferencesRef);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (224042 => 224043)
--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-10-26 20:17:36 UTC (rev 224042)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2017-10-26 20:20:42 UTC (rev 224043)
@@ -3393,7 +3393,7 @@
#endif
#if ENABLE(PAYMENT_REQUEST)
- settings.setPaymentRequestEnabled(store.getBoolValueForKey(WebPreferencesKey::paymentRequestEnabledKey()));
+ settings.setPaymentRequestEnabled(store.getBoolValueForKey(WebPreferencesKey::applePayEnabledKey()));
#endif
settings.setStorageAccessAPIEnabled(store.getBoolValueForKey(WebPreferencesKey::storageAccessAPIEnabledKey()));
Modified: trunk/Tools/ChangeLog (224042 => 224043)
--- trunk/Tools/ChangeLog 2017-10-26 20:17:36 UTC (rev 224042)
+++ trunk/Tools/ChangeLog 2017-10-26 20:20:42 UTC (rev 224043)
@@ -1,3 +1,13 @@
+2017-10-26 Andy Estes <[email protected]>
+
+ [Payment Request] Enable Payment Request whenever Apple Pay is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=178880
+
+ Reviewed by Tim Horton.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+
2017-10-26 Joseph Pecoraro <[email protected]>
Add and update some watchlists
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (224042 => 224043)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-10-26 20:17:36 UTC (rev 224042)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-10-26 20:20:42 UTC (rev 224043)
@@ -739,10 +739,6 @@
WKPreferencesSetInspectorAdditionsEnabled(preferences, options.enableInspectorAdditions);
-#if ENABLE(PAYMENT_REQUEST)
- WKPreferencesSetPaymentRequestEnabled(preferences, true);
-#endif
-
WKPreferencesSetStorageAccessAPIEnabled(preferences, true);
platformResetPreferencesToConsistentValues();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
