[webkit-changes] [WebKit/WebKit] a069e9: PaymentSetupConfiguration.mm is duplicated under W...

Abrar Rahman Protyasha noreply at github.com
Thu Aug 3 21:10:58 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: a069e94f1dc5d550b9f38d50beb115539078518f
      https://github.com/WebKit/WebKit/commit/a069e94f1dc5d550b9f38d50beb115539078518f
  Author: Abrar Rahman Protyasha <a_protyasha at apple.com>
  Date:   2023-08-03 (Thu, 03 Aug 2023)

  Changed paths:
    R Source/WebKit/Shared/ApplePay/PaymentSetupConfiguration.mm
    R Source/WebKit/Shared/ApplePay/cocoa/PaymentSetupConfiguration.mm
    A Source/WebKit/Shared/ApplePay/cocoa/PaymentSetupConfigurationCocoa.mm
    M Source/WebKit/SourcesCocoa.txt
    M Source/WebKit/WebKit.xcodeproj/project.pbxproj

  Log Message:
  -----------
  PaymentSetupConfiguration.mm is duplicated under WebKit/Shared/ApplePay/
https://bugs.webkit.org/show_bug.cgi?id=259799
rdar://113360189

Reviewed by Megan Gardner and Aditya Keerthi.

We seem to have accidentally checked-in two copies of
PaymentSetupConfigration.mm into the source tree while upstreaming
ApplePay code from WKA in 223918 at main, with the copy under
WebKit/Shared/ApplePay/cocoa/ not being used at all.

This commit just removes the unused copy and moves the up-to-date copy
to WebKit/Shared/ApplePay/cocoa/PaymentSetupConfigurationCocoa.mm.

* Source/WebKit/Shared/ApplePay/cocoa/PaymentSetupConfiguration.mm: Removed.
* Source/WebKit/Shared/ApplePay/cocoa/PaymentSetupConfigurationCocoa.mm: Renamed from Source/WebKit/Shared/ApplePay/PaymentSetupConfiguration.mm.
(WebKit::toPlatformConfiguration):
(WebKit::PaymentSetupConfiguration::platformConfiguration const):
(WebKit::PaymentSetupConfiguration::PaymentSetupConfiguration):
* Source/WebKit/SourcesCocoa.txt:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/266568@main




More information about the webkit-changes mailing list