Attachment 371105 Details for Bug 198449 – Patch

[patch] Patch

bug-198449-20190531202916.patch (text/plain), 5.04 KB, created by Andy Estes on 2019-05-31 20:29:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2019-05-31 20:29:17 PDT

Size: 5.04 KB

patch

obsolete

>Subversion Revision: 245853
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9fb761ba875db93d9cc593f20dac47686e04809c..4fbc271030cdf737e255c09774a09b6bdd562a3f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,24 @@
>+2019-05-31  Andy Estes  <aestes@apple.com>
>+
>+        [Apple Pay] Every PaymentCoordinator client should explicitly decide whether they support unrestricted Apple Pay
>+        https://bugs.webkit.org/show_bug.cgi?id=198449
>+        <rdar://problem/51038583>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Rather than having a default return value of true for
>+        PaymentCoordinatorClient::supportsUnrestrictedApplePay, make it pure virtual to force each
>+        subclass to implement an override and explicitly choose an appropriate return value.
>+
>+        The only two clients that did not explicitly override were the empty client and
>+        WebKitLegacy's client, and Apple Pay was never enabled in those clients, so there is no
>+        change in behavior.
>+
>+        * Modules/applepay/PaymentCoordinatorClient.h:
>+        (WebCore::PaymentCoordinatorClient::isAlwaysOnLoggingAllowed const):
>+        (WebCore::PaymentCoordinatorClient::supportsUnrestrictedApplePay const): Deleted.
>+        * loader/EmptyClients.cpp:
>+
> 2019-05-29  Ludovico de Nittis  <ludovico.denittis@collabora.com>
> 
>         Prepend KEY_ to the last key alias in PlatformEventKeyboardGtk
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index a4f6e5575855164351a837a7eec45a8f870869e5..5c42d526d925c05291251074a83229a754f0ccb9 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-05-31  Andy Estes  <aestes@apple.com>
>+
>+        [Apple Pay] Every PaymentCoordinator client should explicitly decide whether they support unrestricted Apple Pay
>+        https://bugs.webkit.org/show_bug.cgi?id=198449
>+        <rdar://problem/51038583>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebCoreSupport/WebPaymentCoordinatorClient.h:
>+        * WebCoreSupport/WebPaymentCoordinatorClient.mm:
>+        (WebPaymentCoordinatorClient::supportsUnrestrictedApplePay const):
>+
> 2019-05-28  Brent Fulgham  <bfulgham@apple.com>
>         Protect frames during style and layout changes
>         https://bugs.webkit.org/show_bug.cgi?id=198047
>diff --git a/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h b/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h
>index a2af4f19f50c0da960326081441898ae6f573ee8..8d523c0e22eb6543d7fd6b1ac1a2457f28247fb2 100644
>--- a/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h
>+++ b/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h
>@@ -62,12 +62,12 @@ public:
>     virtual void abortPaymentSession() = 0;
>     virtual void cancelPaymentSession() = 0;
>     virtual void paymentCoordinatorDestroyed() = 0;
>+    virtual bool supportsUnrestrictedApplePay() const = 0;
> 
>     virtual bool isMockPaymentCoordinator() const { return false; }
>     virtual bool isWebPaymentCoordinator() const { return false; }
> 
>     virtual bool isAlwaysOnLoggingAllowed() const { return false; }
>-    virtual bool supportsUnrestrictedApplePay() const { return true; }
> 
> protected:
>     virtual ~PaymentCoordinatorClient() = default;
>diff --git a/Source/WebCore/loader/EmptyClients.cpp b/Source/WebCore/loader/EmptyClients.cpp
>index a754aad22e026c50cf994fb62b1175b25d5712d3..a57101caa581a733cf691b6fa85db2ce80e8f963 100644
>--- a/Source/WebCore/loader/EmptyClients.cpp
>+++ b/Source/WebCore/loader/EmptyClients.cpp
>@@ -332,6 +332,7 @@ class EmptyPaymentCoordinatorClient final : public PaymentCoordinatorClient {
>     void cancelPaymentSession() final { }
>     void abortPaymentSession() final { }
>     void paymentCoordinatorDestroyed() final { }
>+    bool supportsUnrestrictedApplePay() const final { return false; }
> };
> 
> #endif
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.h b/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.h
>index 080d36dc87a8801a79fe14ef961176f328c492b1..f431a4df539f65a4d7d5143fa5039f8c94e686ef 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.h
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.h
>@@ -49,6 +49,7 @@ private:
>     void abortPaymentSession() override;
>     void cancelPaymentSession() override;
>     void paymentCoordinatorDestroyed() override;
>+    bool supportsUnrestrictedApplePay() const override;
> };
> 
> #endif
>diff --git a/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm b/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm
>index fcc1ddf3c933b8b02b891a7b8a9dc2063ecfb72c..bb994b3469fe23a5be6bf2220e7123e4a126ed9b 100644
>--- a/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm
>+++ b/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm
>@@ -101,4 +101,9 @@ void WebPaymentCoordinatorClient::paymentCoordinatorDestroyed()
>     delete this;
> }
> 
>+bool WebPaymentCoordinatorClient::supportsUnrestrictedApplePay() const
>+{
>+    return false;
>+}
>+
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 198449: 371105