Finish unifying Apple Pay and Payment Request sources
authoraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Feb 2018 19:47:46 +0000 (19:47 +0000)
committeraestes@apple.com <aestes@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Feb 2018 19:47:46 +0000 (19:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=182831

Reviewed by Keith Miller.

* Sources.txt:
* SourcesCocoa.txt:
* WebCore.xcodeproj/project.pbxproj:

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

Source/WebCore/ChangeLog
Source/WebCore/Sources.txt
Source/WebCore/SourcesCocoa.txt
Source/WebCore/WebCore.xcodeproj/project.pbxproj

index 18c5a9f..7ef6c63 100644 (file)
@@ -1,3 +1,14 @@
+2018-02-15  Andy Estes  <aestes@apple.com>
+
+        Finish unifying Apple Pay and Payment Request sources
+        https://bugs.webkit.org/show_bug.cgi?id=182831
+
+        Reviewed by Keith Miller.
+
+        * Sources.txt:
+        * SourcesCocoa.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2018-02-15  Zan Dobersek  <zdobersek@igalia.com>
 
         HarfBuzzFace: rework cache entry reference holding
index d02249d..53b9f00 100644 (file)
@@ -187,6 +187,8 @@ Modules/navigatorcontentutils/NavigatorContentUtils.cpp
 Modules/notifications/Notification.cpp
 Modules/notifications/NotificationController.cpp
 
+Modules/paymentrequest/MerchantValidationEvent.cpp
+Modules/paymentrequest/PaymentAddress.cpp
 Modules/paymentrequest/PaymentHandler.cpp
 Modules/paymentrequest/PaymentRequest.cpp
 Modules/paymentrequest/PaymentRequestUpdateEvent.cpp
@@ -2684,6 +2686,7 @@ JSMediaStreamTrack.cpp
 JSMediaStreamTrackEvent.cpp
 JSMediaTrackConstraints.cpp
 JSMediaTrackSupportedConstraints.cpp
+JSMerchantValidationEvent.cpp
 JSMessageChannel.cpp
 JSMessageEvent.cpp
 JSMessagePort.cpp
index 14dc0d1..4531d06 100644 (file)
@@ -384,29 +384,33 @@ platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
     Modules/applepay/ApplePayShippingMethodSelectedEvent.cpp
     Modules/applepay/ApplePayValidateMerchantEvent.cpp
     Modules/applepay/PaymentCoordinator.cpp
-    Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp
     Modules/applepay/PaymentRequestValidator.mm
+    Modules/applepay/PaymentSession.cpp
 
+    Modules/applepay/cocoa/PaymentCocoa.mm
     Modules/applepay/cocoa/PaymentContactCocoa.mm
     Modules/applepay/cocoa/PaymentMerchantSessionCocoa.mm @no-unify
     Modules/applepay/cocoa/PaymentMethodCocoa.mm
-    Modules/applepay/cocoa/PaymentCocoa.mm
+
+    Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp
 
     JSApplePayContactField.cpp
-    JSApplePayMerchantCapability.cpp
-    JSApplePayRequest.cpp
-    JSApplePayRequestBase.cpp
     JSApplePayError.cpp
     JSApplePayLineItem.cpp
+    JSApplePayMerchantCapability.cpp
+    JSApplePayModifier.cpp
     JSApplePayPayment.cpp
     JSApplePayPaymentAuthorizationResult.cpp
     JSApplePayPaymentAuthorizedEvent.cpp
     JSApplePayPaymentContact.cpp
     JSApplePayPaymentMethod.cpp
     JSApplePayPaymentMethodSelectedEvent.cpp
+    JSApplePayPaymentMethodType.cpp
     JSApplePayPaymentMethodUpdate.cpp
     JSApplePayPaymentPass.cpp
     JSApplePayPaymentRequest.cpp
+    JSApplePayRequest.cpp
+    JSApplePayRequestBase.cpp
     JSApplePaySession.cpp
     JSApplePayShippingContactSelectedEvent.cpp
     JSApplePayShippingContactUpdate.cpp
@@ -416,4 +420,3 @@ platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
     JSApplePayValidateMerchantEvent.cpp
 
 #endif
-
index 25fdb7d..f72a23d 100644 (file)
                A10DC76B14747BAB005E2471 /* StyleGridData.h in Headers */ = {isa = PBXBuildFile; fileRef = A10DC76914747BAB005E2471 /* StyleGridData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A110DB9B14F5DF7700A03B93 /* StyleGridItemData.h in Headers */ = {isa = PBXBuildFile; fileRef = A110DB9A14F5DF7700A03B93 /* StyleGridItemData.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A11AE0CC1FFD60530047348B /* MerchantValidationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = A11AE0C91FFD60530047348B /* MerchantValidationEvent.h */; };
-               A11AE0CD1FFD60530047348B /* MerchantValidationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A11AE0CA1FFD60530047348B /* MerchantValidationEvent.cpp */; };
-               A11AE0D21FFD61DF0047348B /* JSMerchantValidationEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A11AE0D01FFD61DE0047348B /* JSMerchantValidationEvent.cpp */; };
                A11AE0D31FFD61DF0047348B /* JSMerchantValidationEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = A11AE0D11FFD61DF0047348B /* JSMerchantValidationEvent.h */; };
                A11E8C051B1E28F40003A7C7 /* copyCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = A11E8C001B1E28BE0003A7C7 /* copyCursor.png */; };
                A11E8C061B1E28FA0003A7C7 /* moveCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = A11E8C011B1E28BE0003A7C7 /* moveCursor.png */; };
                A12538D413F9B60A00024754 /* LayoutRepainter.h in Headers */ = {isa = PBXBuildFile; fileRef = A120ACA013F9983700FE4AC7 /* LayoutRepainter.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A12705C31656BD6500C2E27C /* GridPosition.h in Headers */ = {isa = PBXBuildFile; fileRef = A12705C21656BD6500C2E27C /* GridPosition.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A12A1050166444FD008FA311 /* GridTrackSize.h in Headers */ = {isa = PBXBuildFile; fileRef = A12A104E166444DC008FA311 /* GridTrackSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A12C59EE2035FC9B0012236B /* ApplePayError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFD61E71D8DF008F5D34 /* ApplePayError.h */; };
+               A12C59F02035FCAB0012236B /* ApplePayPaymentAuthorizationResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFD81E71D8DF008F5D34 /* ApplePayPaymentAuthorizationResult.h */; };
+               A12C59F12035FCBF0012236B /* ApplePayPaymentMethodUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFDA1E71D8DF008F5D34 /* ApplePayPaymentMethodUpdate.h */; };
+               A12C59F22035FCD60012236B /* ApplePayShippingContactUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFDC1E71D8DF008F5D34 /* ApplePayShippingContactUpdate.h */; };
+               A12C59F32035FCE20012236B /* ApplePayShippingMethodUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFDE1E71D8DF008F5D34 /* ApplePayShippingMethodUpdate.h */; };
+               A12C59F920360ACB0012236B /* JSApplePayError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFE21E71DCA0008F5D34 /* JSApplePayError.h */; };
+               A12C59FB20360B000012236B /* JSApplePayPaymentAuthorizationResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFE41E71DCA0008F5D34 /* JSApplePayPaymentAuthorizationResult.h */; };
+               A12C59FC20360B270012236B /* JSApplePayPaymentMethodUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFE61E71DCA0008F5D34 /* JSApplePayPaymentMethodUpdate.h */; };
+               A12C59FD20360B3E0012236B /* JSApplePayShippingContactUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFE81E71DCA0008F5D34 /* JSApplePayShippingContactUpdate.h */; };
+               A12C59FE20360B4A0012236B /* JSApplePayShippingMethodUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ADFDFEA1E71DCA0008F5D34 /* JSApplePayShippingMethodUpdate.h */; };
                A136A00D1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h in Headers */ = {isa = PBXBuildFile; fileRef = A136A00B1134DBD200CC8D50 /* XMLHttpRequestProgressEventThrottle.h */; };
                A140618B1E2ECA0A0032B34E /* MockPreviewLoaderClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A14061891E2ECA0A0032B34E /* MockPreviewLoaderClient.cpp */; };
                A140618C1E2ECA0A0032B34E /* MockPreviewLoaderClient.h in Headers */ = {isa = PBXBuildFile; fileRef = A140618A1E2ECA0A0032B34E /* MockPreviewLoaderClient.h */; };
                A1BF6B821AA96C7D00AF4A8A /* MockContentFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1BF6B801AA96C7D00AF4A8A /* MockContentFilter.cpp */; };
                A1BF6B831AA96C7D00AF4A8A /* MockContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A1BF6B811AA96C7D00AF4A8A /* MockContentFilter.h */; };
                A1C1507A1E3F2B3E0032C98C /* PreviewConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = A1C150781E3F2B3E0032C98C /* PreviewConverter.h */; };
-               A1C2C5761FA2851600BA46FA /* PaymentSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1C2C5751FA2851600BA46FA /* PaymentSession.cpp */; };
                A1CBEF641F9F11290028DE7C /* MockPaymentMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = A1CBEF631F9F11290028DE7C /* MockPaymentMethod.h */; };
                A1CC56671F46147A00A4555B /* JSPaymentAddress.h in Headers */ = {isa = PBXBuildFile; fileRef = A1CC56651F46146800A4555B /* JSPaymentAddress.h */; };
                A1CC56691F46148000A4555B /* JSPaymentComplete.h in Headers */ = {isa = PBXBuildFile; fileRef = A1CC564E1F46145200A4555B /* JSPaymentComplete.h */; };
                A1CC567B1F4614AD00A4555B /* JSPaymentResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = A1CC56641F46146700A4555B /* JSPaymentResponse.h */; };
                A1CC567D1F4614B200A4555B /* JSPaymentShippingOption.h in Headers */ = {isa = PBXBuildFile; fileRef = A1CC56591F46145C00A4555B /* JSPaymentShippingOption.h */; };
                A1CC567F1F4614B700A4555B /* JSPaymentShippingType.h in Headers */ = {isa = PBXBuildFile; fileRef = A1CC56501F46145300A4555B /* JSPaymentShippingType.h */; };
-               A1CFE0321F9E71290065C345 /* PaymentAddress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1CFE0311F9E71290065C345 /* PaymentAddress.cpp */; };
                A1DF5A7F1F7EBD0B0058A477 /* ApplePayRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = A1DF5A7C1F7EBD0B0058A477 /* ApplePayRequest.h */; };
                A1DF5A861F7EBDF20058A477 /* ApplePayMerchantCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = A1DF5A831F7EBDF20058A477 /* ApplePayMerchantCapability.h */; };
                A1DF5A8E1F7EC0020058A477 /* JSApplePayMerchantCapability.h in Headers */ = {isa = PBXBuildFile; fileRef = A1DF5A8A1F7EC0000058A477 /* JSApplePayMerchantCapability.h */; };
                A1F6CFFF1FE096210018078C /* ApplePayModifier.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F6CFFC1FE096210018078C /* ApplePayModifier.h */; };
                A1F6D0061FE096F60018078C /* ApplePayPaymentMethodType.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F6D0031FE096F60018078C /* ApplePayPaymentMethodType.h */; };
                A1F6D00F1FE099940018078C /* JSApplePayPaymentMethodType.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F6D00E1FE099640018078C /* JSApplePayPaymentMethodType.h */; };
-               A1F6D0101FE099960018078C /* JSApplePayPaymentMethodType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1F6D00D1FE099640018078C /* JSApplePayPaymentMethodType.cpp */; };
-               A1F6D0111FE099B20018078C /* JSApplePayModifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1F6D00A1FE099210018078C /* JSApplePayModifier.cpp */; };
                A1F6D0121FE099B40018078C /* JSApplePayModifier.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F6D00C1FE099220018078C /* JSApplePayModifier.h */; };
                A1F76B131F44C2450014C318 /* PaymentRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F76B101F44C2450014C318 /* PaymentRequest.h */; };
                A1F76B191F44C3900014C318 /* PaymentMethodData.h in Headers */ = {isa = PBXBuildFile; fileRef = A1F76B161F44C3900014C318 /* PaymentMethodData.h */; };
                                0F580FAF149800D400FB5BD8 /* AnimationUtilities.h in Headers */,
                                93309DD7099E64920056E581 /* AppendNodeCommand.h in Headers */,
                                A1DF5A941F7EC4320058A477 /* ApplePayContactField.h in Headers */,
+                               A12C59EE2035FC9B0012236B /* ApplePayError.h in Headers */,
                                7C6579E31E00827000E3A27A /* ApplePayLineItem.h in Headers */,
                                A1DF5A861F7EBDF20058A477 /* ApplePayMerchantCapability.h in Headers */,
                                A1F6CFFF1FE096210018078C /* ApplePayModifier.h in Headers */,
                                7C6523011E00D03400677F22 /* ApplePayPayment.h in Headers */,
+                               A12C59F02035FCAB0012236B /* ApplePayPaymentAuthorizationResult.h in Headers */,
                                1A8A64521D19FCFB00D0E00F /* ApplePayPaymentAuthorizedEvent.h in Headers */,
                                7C6522FB1E00C90900677F22 /* ApplePayPaymentContact.h in Headers */,
                                A1DF5AA21F7EE1130058A477 /* ApplePayPaymentHandler.h in Headers */,
                                7C6522EF1E00A4C700677F22 /* ApplePayPaymentMethod.h in Headers */,
                                1A8A64561D19FCFC00D0E00F /* ApplePayPaymentMethodSelectedEvent.h in Headers */,
                                A1F6D0061FE096F60018078C /* ApplePayPaymentMethodType.h in Headers */,
+                               A12C59F12035FCBF0012236B /* ApplePayPaymentMethodUpdate.h in Headers */,
                                7C6522F51E00A51700677F22 /* ApplePayPaymentPass.h in Headers */,
                                7C6579E01E0079F900E3A27A /* ApplePayPaymentRequest.h in Headers */,
                                A1DF5A7F1F7EBD0B0058A477 /* ApplePayRequest.h in Headers */,
                                1A8A64591D19FCFC00D0E00F /* ApplePaySession.h in Headers */,
                                1A58E8651D19D4EB00C0EA73 /* ApplePaySessionPaymentRequest.h in Headers */,
                                1A8A645C1D19FCFC00D0E00F /* ApplePayShippingContactSelectedEvent.h in Headers */,
+                               A12C59F22035FCD60012236B /* ApplePayShippingContactUpdate.h in Headers */,
                                7C6579E81E00831600E3A27A /* ApplePayShippingMethod.h in Headers */,
                                1A8A64601D19FCFC00D0E00F /* ApplePayShippingMethodSelectedEvent.h in Headers */,
+                               A12C59F32035FCE20012236B /* ApplePayShippingMethodUpdate.h in Headers */,
                                1A8A64631D19FCFC00D0E00F /* ApplePayValidateMerchantEvent.h in Headers */,
                                1A8F6BBD0DB55CDC001DB794 /* ApplicationCache.h in Headers */,
                                1A8F6BBF0DB55CDC001DB794 /* ApplicationCacheGroup.h in Headers */,
                                714C7C6D1FDADAF600F2BEE1 /* JSAnimationPlaybackEventInit.h in Headers */,
                                71025EDE1F99F1EC004A250C /* JSAnimationTimeline.h in Headers */,
                                A1DF5A991F7EC8C00058A477 /* JSApplePayContactField.h in Headers */,
+                               A12C59F920360ACB0012236B /* JSApplePayError.h in Headers */,
                                7C6579F01E00856600E3A27A /* JSApplePayLineItem.h in Headers */,
                                A1DF5A8E1F7EC0020058A477 /* JSApplePayMerchantCapability.h in Headers */,
                                A1F6D0121FE099B40018078C /* JSApplePayModifier.h in Headers */,
                                7C6523141E00DBB400677F22 /* JSApplePayPayment.h in Headers */,
+                               A12C59FB20360B000012236B /* JSApplePayPaymentAuthorizationResult.h in Headers */,
                                1AE96A8B1D1A0DDD00B86768 /* JSApplePayPaymentAuthorizedEvent.h in Headers */,
                                7C6523161E00DBB500677F22 /* JSApplePayPaymentContact.h in Headers */,
                                7C6523181E00DBB500677F22 /* JSApplePayPaymentMethod.h in Headers */,
                                1AE96A8D1D1A0DDD00B86768 /* JSApplePayPaymentMethodSelectedEvent.h in Headers */,
                                A1F6D00F1FE099940018078C /* JSApplePayPaymentMethodType.h in Headers */,
+                               A12C59FC20360B270012236B /* JSApplePayPaymentMethodUpdate.h in Headers */,
                                7C65231A1E00DBB500677F22 /* JSApplePayPaymentPass.h in Headers */,
                                7C6579F21E00856600E3A27A /* JSApplePayPaymentRequest.h in Headers */,
                                A1DF5A8F1F7EC0020058A477 /* JSApplePayRequest.h in Headers */,
                                A1DF5AB31F8077530058A477 /* JSApplePayRequestBase.h in Headers */,
                                1AE96A8F1D1A0DDD00B86768 /* JSApplePaySession.h in Headers */,
                                1AE96A911D1A0DDD00B86768 /* JSApplePayShippingContactSelectedEvent.h in Headers */,
+                               A12C59FD20360B3E0012236B /* JSApplePayShippingContactUpdate.h in Headers */,
                                7C6579F41E00856600E3A27A /* JSApplePayShippingMethod.h in Headers */,
                                1AE96A931D1A0DDD00B86768 /* JSApplePayShippingMethodSelectedEvent.h in Headers */,
+                               A12C59FE20360B4A0012236B /* JSApplePayShippingMethodUpdate.h in Headers */,
                                65DF31DB09D1C123000BE325 /* JSAttr.h in Headers */,
                                FDA15E9E12B03EE1003A583A /* JSAudioBuffer.h in Headers */,
                                FDF7E9C413AC21DB00A51EAC /* JSAudioBufferCallback.h in Headers */,
                                07367DE0172CA68200D861B9 /* InbandTextTrackPrivateLegacyAVFObjC.mm in Sources */,
                                BE16C59417CFE17200852C04 /* InbandWebVTTTextTrack.cpp in Sources */,
                                CD063F821E23FA8900812BE3 /* InitDataRegistry.cpp in Sources */,
-                               A1F6D0111FE099B20018078C /* JSApplePayModifier.cpp in Sources */,
-                               A1F6D0101FE099960018078C /* JSApplePayPaymentMethodType.cpp in Sources */,
-                               A11AE0D21FFD61DF0047348B /* JSMerchantValidationEvent.cpp in Sources */,
                                538EC93E1F99BF5A004D22A8 /* JSQuickTimePluginReplacement.cpp in Sources */,
                                935C477009AC4D7300A6AAB4 /* KeyEventMac.mm in Sources */,
                                CDA98E0B1603CD6000FEA3B1 /* LegacyCDM.cpp in Sources */,
                                C90F65551B2253B1002163A1 /* MediaSessionManager.cpp in Sources */,
                                07638A9A1884487200E15A1B /* MediaSessionManagerIOS.mm in Sources */,
                                CDC8B5A6180474F70016E685 /* MediaSourcePrivateAVFObjC.mm in Sources */,
-                               A11AE0CD1FFD60530047348B /* MerchantValidationEvent.cpp in Sources */,
                                CDF2B0101820540600F2B424 /* MockBox.cpp in Sources */,
                                51058ADF1D67C229009A538C /* MockGamepad.cpp in Sources */,
                                51058AE11D67C229009A538C /* MockGamepadProvider.cpp in Sources */,
                                A31C4E4D16E02AA6002F7957 /* OESTextureHalfFloat.cpp in Sources */,
                                31078CC71880AAB5008099DC /* OESTextureHalfFloatLinear.cpp in Sources */,
                                77A17A7112F28182004E02F6 /* OESVertexArrayObject.cpp in Sources */,
-                               A1CFE0321F9E71290065C345 /* PaymentAddress.cpp in Sources */,
                                DE5F86101FA238D9006DB63A /* PaymentMerchantSessionCocoa.mm in Sources */,
-                               A1C2C5761FA2851600BA46FA /* PaymentSession.cpp in Sources */,
                                AA12DF491743DF83004DAFDF /* PlatformSpeechSynthesizerIOS.mm in Sources */,
                                CDA29A301CBF74D400901CCF /* PlaybackSessionInterfaceAVKit.mm in Sources */,
                                CDA29A161CBDA56C00901CCF /* PlaybackSessionInterfaceMac.mm in Sources */,