Title: [262906] branches/safari-610.1.15.50-branch/Source/WebKit
Revision
262906
Author
[email protected]
Date
2020-06-11 10:16:00 -0700 (Thu, 11 Jun 2020)

Log Message

Cherry-pick r262159. rdar://problem/64257403

    Fix the engineering build on internal SDKs

    * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
    (WebKit::WebPaymentCoordinatorProxy::platformPaymentRequest): Silenced a deprecation warning.

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

Modified Paths

Diff

Modified: branches/safari-610.1.15.50-branch/Source/WebKit/ChangeLog (262905 => 262906)


--- branches/safari-610.1.15.50-branch/Source/WebKit/ChangeLog	2020-06-11 17:14:07 UTC (rev 262905)
+++ branches/safari-610.1.15.50-branch/Source/WebKit/ChangeLog	2020-06-11 17:16:00 UTC (rev 262906)
@@ -1,3 +1,21 @@
+2020-06-11  Alan Coon  <[email protected]>
+
+        Cherry-pick r262159. rdar://problem/64257403
+
+    Fix the engineering build on internal SDKs
+    
+    * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+    (WebKit::WebPaymentCoordinatorProxy::platformPaymentRequest): Silenced a deprecation warning.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@262159 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-05-26  Andy Estes  <[email protected]>
+
+            Fix the engineering build on internal SDKs
+
+            * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+            (WebKit::WebPaymentCoordinatorProxy::platformPaymentRequest): Silenced a deprecation warning.
+
 2020-06-08  Alan Coon  <[email protected]>
 
         Cherry-pick r262644. rdar://problem/64127898

Modified: branches/safari-610.1.15.50-branch/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (262905 => 262906)


--- branches/safari-610.1.15.50-branch/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	2020-06-11 17:14:07 UTC (rev 262905)
+++ branches/safari-610.1.15.50-branch/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm	2020-06-11 17:16:00 UTC (rev 262906)
@@ -238,7 +238,9 @@
 
     [result setPaymentSummaryItems:WebCore::platformSummaryItems(paymentRequest.total(), paymentRequest.lineItems())];
 
+    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     [result setExpectsMerchantSession:YES];
+    ALLOW_DEPRECATED_DECLARATIONS_END
 
     if (!paymentRequest.applicationData().isNull()) {
         auto applicationData = adoptNS([[NSData alloc] initWithBase64EncodedString:paymentRequest.applicationData() options:0]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to