Unreviewed, fix regression from r273194 that was spotted by Darin Adler after landing.

cdumez · cdumez · commit 3b79a52440e0 · 2021-02-20T18:13:36.000Z
* Platform/cocoa/WKPaymentAuthorizationDelegate.mm: (-[WKPaymentAuthorizationDelegate completePaymentMethodSelection:]): (-[WKPaymentAuthorizationDelegate completeShippingContactSelection:]): (-[WKPaymentAuthorizationDelegate completeShippingMethodSelection:]): Canonical link: https://commits.webkit.org/234387@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@273201 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2021-02-20  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed, fix regression from r273194 that was spotted by Darin Adler after landing.
+
+        * Platform/cocoa/WKPaymentAuthorizationDelegate.mm:
+        (-[WKPaymentAuthorizationDelegate completePaymentMethodSelection:]):
+        (-[WKPaymentAuthorizationDelegate completeShippingContactSelection:]):
+        (-[WKPaymentAuthorizationDelegate completeShippingMethodSelection:]):
+
 2021-02-19  Chris Dumez  <cdumez@apple.com>
 
         Crash under Decoder::Decoder()
diff --git a/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.mm b/Source/WebKit/Platform/cocoa/WKPaymentAuthorizationDelegate.mm
@@ -69,7 +69,7 @@ - (void)completeMerchantValidation:(PKPaymentMerchantSession *)session error:(NS
 
 - (void)completePaymentMethodSelection:(PKPaymentRequestPaymentMethodUpdate *)paymentMethodUpdate
 {
-    auto update = !paymentMethodUpdate ? adoptNS([PAL::allocPKPaymentRequestPaymentMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]) : nil;
+    auto update = paymentMethodUpdate ? retainPtr(paymentMethodUpdate) : adoptNS([PAL::allocPKPaymentRequestPaymentMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]);
     _summaryItems = adoptNS([[update paymentSummaryItems] copy]);
     std::exchange(_didSelectPaymentMethodCompletion, nil)(update.get());
 }
@@ -81,15 +81,15 @@ - (void)completePaymentSession:(PKPaymentAuthorizationStatus)status errors:(NSAr
 }
 - (void)completeShippingContactSelection:(PKPaymentRequestShippingContactUpdate *)shippingContactUpdate
 {
-    auto update = !shippingContactUpdate ? adoptNS([PAL::allocPKPaymentRequestShippingContactUpdateInstance() initWithErrors:@[] paymentSummaryItems:_summaryItems.get() shippingMethods:_shippingMethods.get()]) : nil;
+    auto update = shippingContactUpdate ? retainPtr(shippingContactUpdate) : adoptNS([PAL::allocPKPaymentRequestShippingContactUpdateInstance() initWithErrors:@[] paymentSummaryItems:_summaryItems.get() shippingMethods:_shippingMethods.get()]);
     _summaryItems = adoptNS([[update paymentSummaryItems] copy]);
     _shippingMethods = adoptNS([[update shippingMethods] copy]);
     std::exchange(_didSelectShippingContactCompletion, nil)(update.get());
 }
 
 - (void)completeShippingMethodSelection:(PKPaymentRequestShippingMethodUpdate *)shippingMethodUpdate
 {
-    auto update = !shippingMethodUpdate ? adoptNS([PAL::allocPKPaymentRequestShippingMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]) : nil;
+    auto update = shippingMethodUpdate ? retainPtr(shippingMethodUpdate) : adoptNS([PAL::allocPKPaymentRequestShippingMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]);
     _summaryItems = adoptNS([[update paymentSummaryItems] copy]);
     std::exchange(_didSelectShippingMethodCompletion, nil)(update.get());
 }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ - (void)completeMerchantValidation:(PKPaymentMerchantSession *)session error:(NS`
`69`	`69`
`70`	`70`	`- (void)completePaymentMethodSelection:(PKPaymentRequestPaymentMethodUpdate *)paymentMethodUpdate`
`71`	`71`	`{`
`72`		`- auto update = !paymentMethodUpdate ? adoptNS([PAL::allocPKPaymentRequestPaymentMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]) : nil;`
	`72`	`+ auto update = paymentMethodUpdate ? retainPtr(paymentMethodUpdate) : adoptNS([PAL::allocPKPaymentRequestPaymentMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]);`
`73`	`73`	`_summaryItems = adoptNS([[update paymentSummaryItems] copy]);`
`74`	`74`	`std::exchange(_didSelectPaymentMethodCompletion, nil)(update.get());`
`75`	`75`	`}`
`@@ -81,15 +81,15 @@ - (void)completePaymentSession:(PKPaymentAuthorizationStatus)status errors:(NSAr`
`81`	`81`	`}`
`82`	`82`	`- (void)completeShippingContactSelection:(PKPaymentRequestShippingContactUpdate *)shippingContactUpdate`
`83`	`83`	`{`
`84`		`- auto update = !shippingContactUpdate ? adoptNS([PAL::allocPKPaymentRequestShippingContactUpdateInstance() initWithErrors:@[] paymentSummaryItems:_summaryItems.get() shippingMethods:_shippingMethods.get()]) : nil;`
	`84`	`+ auto update = shippingContactUpdate ? retainPtr(shippingContactUpdate) : adoptNS([PAL::allocPKPaymentRequestShippingContactUpdateInstance() initWithErrors:@[] paymentSummaryItems:_summaryItems.get() shippingMethods:_shippingMethods.get()]);`
`85`	`85`	`_summaryItems = adoptNS([[update paymentSummaryItems] copy]);`
`86`	`86`	`_shippingMethods = adoptNS([[update shippingMethods] copy]);`
`87`	`87`	`std::exchange(_didSelectShippingContactCompletion, nil)(update.get());`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`- (void)completeShippingMethodSelection:(PKPaymentRequestShippingMethodUpdate *)shippingMethodUpdate`
`91`	`91`	`{`
`92`		`- auto update = !shippingMethodUpdate ? adoptNS([PAL::allocPKPaymentRequestShippingMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]) : nil;`
	`92`	`+ auto update = shippingMethodUpdate ? retainPtr(shippingMethodUpdate) : adoptNS([PAL::allocPKPaymentRequestShippingMethodUpdateInstance() initWithPaymentSummaryItems:_summaryItems.get()]);`
`93`	`93`	`_summaryItems = adoptNS([[update paymentSummaryItems] copy]);`
`94`	`94`	`std::exchange(_didSelectShippingMethodCompletion, nil)(update.get());`
`95`	`95`	`}`