Changeset 246014 in webkit

Timestamp:

Jun 1, 2019, 9:19:40 AM (7 years ago)

Author:

aestes@apple.com

Message:

[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 Wenson Hsieh.

Source/WebCore:

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:

Source/WebKitLegacy/mac:

• WebCoreSupport/WebPaymentCoordinatorClient.h:
• WebCoreSupport/WebPaymentCoordinatorClient.mm:

(WebPaymentCoordinatorClient::supportsUnrestrictedApplePay const):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/applepay/PaymentCoordinatorClient.h (modified) (2 diffs)
• WebCore/loader/EmptyClients.cpp (modified) (1 diff)
• WebKitLegacy/mac/ChangeLog (modified) (1 diff)
• WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.h (modified) (1 diff)
• WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-01  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 Wenson Hsieh.
+
+        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-31  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h

@@ -63 +63 @@
     virtual void cancelPaymentSession() = 0;
     virtual void paymentCoordinatorDestroyed() = 0;
+    virtual bool supportsUnrestrictedApplePay() const = 0;
 
     virtual bool isMockPaymentCoordinator() const { return false; }
@@ -68 +69 @@
 
     virtual bool isAlwaysOnLoggingAllowed() const { return false; }
-    virtual bool supportsUnrestrictedApplePay() const { return true; }
 
 protected:

trunk/Source/WebCore/loader/EmptyClients.cpp

@@ -333 +333 @@
     void abortPaymentSession() final { }
     void paymentCoordinatorDestroyed() final { }
+    bool supportsUnrestrictedApplePay() const final { return false; }
 };
 

trunk/Source/WebKitLegacy/mac/ChangeLog

@@ +1 @@
+2019-06-01  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 Wenson Hsieh.
+
+        * WebCoreSupport/WebPaymentCoordinatorClient.h:
+        * WebCoreSupport/WebPaymentCoordinatorClient.mm:
+        (WebPaymentCoordinatorClient::supportsUnrestrictedApplePay const):
+
 2019-05-29  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.h

@@ -50 +50 @@
     void cancelPaymentSession() override;
     void paymentCoordinatorDestroyed() override;
+    bool supportsUnrestrictedApplePay() const override;
 };
 

trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm

@@ -102 +102 @@
 }
 
+bool WebPaymentCoordinatorClient::supportsUnrestrictedApplePay() const
+{
+    return false;
+}
+
 #endif