Changeset 202346 in webkit


Ignore:
Timestamp:
Jun 22, 2016 1:38:15 PM (8 years ago)
Author:
andersca@apple.com
Message:

Move the WebKitLegacy Apple Pay code to the open source repository
​https://bugs.webkit.org/show_bug.cgi?id=159035

Reviewed by Tim Horton.

Source/WebKit:

  • WebKit.xcodeproj/project.pbxproj:

Source/WebKit/mac:

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

(WebPaymentCoordinatorClient::WebPaymentCoordinatorClient):
(WebPaymentCoordinatorClient::~WebPaymentCoordinatorClient):
(WebPaymentCoordinatorClient::supportsVersion):
(WebPaymentCoordinatorClient::canMakePayments):
(WebPaymentCoordinatorClient::canMakePaymentsWithActiveCard):
(WebPaymentCoordinatorClient::showPaymentUI):
(WebPaymentCoordinatorClient::completeMerchantValidation):
(WebPaymentCoordinatorClient::completeShippingMethodSelection):
(WebPaymentCoordinatorClient::completeShippingContactSelection):
(WebPaymentCoordinatorClient::completePaymentMethodSelection):
(WebPaymentCoordinatorClient::completePaymentSession):
(WebPaymentCoordinatorClient::abortPaymentSession):
(WebPaymentCoordinatorClient::mainFrameDestroyed):

  • WebKitAdditions.mm: Removed.
  • WebView/WebView.mm:

(-[WebView _commonInitializationWithFrameName:groupName:]):

Location:
trunk/Source/WebKit
Files:
2 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r202242 r202346  
     12016-06-22  Anders Carlsson  <andersca@apple.com>
     2
     3        Move the WebKitLegacy Apple Pay code to the open source repository
     4        https://bugs.webkit.org/show_bug.cgi?id=159035
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebKit.xcodeproj/project.pbxproj:
     9
    1102016-06-20  Keith Rollin  <krollin@apple.com>
    211

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r202005 r202346  
    5151                1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
    5252                1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */; };
    53                 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */; };
    5453                1A86CCD41AD48A620074BA89 /* WebApplicationCacheInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */; };
    5554                1A8DED500EE88B8A00F25022 /* HostedNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */; };
    … …  
    7675                1AAF5FBF0EDE3A92008D883D /* WebHostedNetscapePluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5FBD0EDE3A92008D883D /* WebHostedNetscapePluginView.h */; };
    7776                1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */; };
     77                1AB1F76E1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F76C1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h */; };
     78                1AB1F76F1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F76D1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm */; };
    7879                1AC7176E1A26568A002E3115 /* WebVisitedLinkStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC7176C1A26568A002E3115 /* WebVisitedLinkStore.mm */; };
    7980                1AC7176F1A26568A002E3115 /* WebVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC7176D1A26568A002E3115 /* WebVisitedLinkStore.h */; };
    … …  
    507508                1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
    508509                1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginRequest.m; sourceTree = "<group>"; };
    509                 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebKitAdditions.mm; path = mac/WebKitAdditions.mm; sourceTree = "<group>"; };
    510510                1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheInternal.h; sourceTree = "<group>"; };
    511511                1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostedNetscapePluginStream.h; sourceTree = "<group>"; };
    … …  
    529529                1AAF5FBD0EDE3A92008D883D /* WebHostedNetscapePluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHostedNetscapePluginView.h; sourceTree = "<group>"; };
    530530                1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHostedNetscapePluginView.mm; sourceTree = "<group>"; };
     531                1AB1F76C1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPaymentCoordinatorClient.h; sourceTree = "<group>"; };
     532                1AB1F76D1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPaymentCoordinatorClient.mm; sourceTree = "<group>"; };
    531533                1AC7176C1A26568A002E3115 /* WebVisitedLinkStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVisitedLinkStore.mm; sourceTree = "<group>"; };
    532534                1AC7176D1A26568A002E3115 /* WebVisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVisitedLinkStore.h; sourceTree = "<group>"; };
    … …  
    962964                                319A3F4D1885E5FB00E0C900 /* WebKit.mac.exp */,
    963965                                A10C1D8F1820307D0036883A /* WebKit.iOS.exp */,
    964                                 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */,
    965966                                F5C283730284676D018635CA /* WebKitPrefix.h */,
    966967                                A182B74E199E7B8F001FD95A /* migrate-headers.sh */,
    … …  
    15931594                                A58A5797143E727000125F50 /* WebOpenPanelResultListener.h */,
    15941595                                A58A5798143E727000125F50 /* WebOpenPanelResultListener.mm */,
     1596                                1AB1F76C1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h */,
     1597                                1AB1F76D1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm */,
    15951598                                1AA879B411CBE9BF003C664F /* WebPlatformStrategies.h */,
    15961599                                1AA879B511CBE9BF003C664F /* WebPlatformStrategies.mm */,
    … …  
    18661869                                5185F62610712B80007AA393 /* WebNavigationData.h in Headers */,
    18671870                                1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */,
     1871                                1AB1F76E1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h in Headers */,
    18681872                                1AEA66D80DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h in Headers */,
    18691873                                1AEA6A500DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.h in Headers */,
    … …  
    22442248                                939810F30824BF01008DF038 /* WebHTMLRepresentation.mm in Sources */,
    22452249                                939810F40824BF01008DF038 /* WebHTMLView.mm in Sources */,
     2250                                1AB1F76F1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm in Sources */,
    22462251                                939810C10824BF01008DF038 /* WebIconDatabase.mm in Sources */,
    22472252                                51494CD70C7EBDE0004178C5 /* WebIconDatabaseClient.mm in Sources */,
    … …  
    22572262                                939811170824BF01008DF038 /* WebKeyGenerator.mm in Sources */,
    22582263                                939811030824BF01008DF038 /* WebKitErrors.m in Sources */,
    2259                                 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */,
    22602264                                CD8BFCE715531224005AFB25 /* WebKitFullScreenListener.mm in Sources */,
    22612265                                939810C30824BF01008DF038 /* WebKitLogging.m in Sources */,

  • trunk/Source/WebKit/mac/ChangeLog

    r202308 r202346  
     12016-06-22  Anders Carlsson  <andersca@apple.com>
     2
     3        Move the WebKitLegacy Apple Pay code to the open source repository
     4        https://bugs.webkit.org/show_bug.cgi?id=159035
     5
     6        Reviewed by Tim Horton.
     7
     8        * WebCoreSupport/WebPaymentCoordinatorClient.h: Added.
     9        * WebCoreSupport/WebPaymentCoordinatorClient.mm: Added.
     10        (WebPaymentCoordinatorClient::WebPaymentCoordinatorClient):
     11        (WebPaymentCoordinatorClient::~WebPaymentCoordinatorClient):
     12        (WebPaymentCoordinatorClient::supportsVersion):
     13        (WebPaymentCoordinatorClient::canMakePayments):
     14        (WebPaymentCoordinatorClient::canMakePaymentsWithActiveCard):
     15        (WebPaymentCoordinatorClient::showPaymentUI):
     16        (WebPaymentCoordinatorClient::completeMerchantValidation):
     17        (WebPaymentCoordinatorClient::completeShippingMethodSelection):
     18        (WebPaymentCoordinatorClient::completeShippingContactSelection):
     19        (WebPaymentCoordinatorClient::completePaymentMethodSelection):
     20        (WebPaymentCoordinatorClient::completePaymentSession):
     21        (WebPaymentCoordinatorClient::abortPaymentSession):
     22        (WebPaymentCoordinatorClient::mainFrameDestroyed):
     23        * WebKitAdditions.mm: Removed.
     24        * WebView/WebView.mm:
     25        (-[WebView _commonInitializationWithFrameName:groupName:]):
     26
    1272016-06-21  Anders Carlsson  <andersca@apple.com>
    228

  • trunk/Source/WebKit/mac/WebView/WebView.mm

    r202091 r202346  
    9090#import "WebNotificationClient.h"
    9191#import "WebPDFView.h"
     92#import "WebPaymentCoordinatorClient.h"
    9293#import "WebPlatformStrategies.h"
    9394#import "WebPluginDatabase.h"
    … …  
    299300#endif
    300301
    301 #if USE(APPLE_INTERNAL_SDK)
    302 #import <WebKitAdditions/WebViewIncludes.h>
    303 #endif
    304302
    305303#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
    … …  
    10021000#endif
    10031001
     1002#if ENABLE(APPLE_PAY)
     1003    pageConfiguration.paymentCoordinatorClient = new WebPaymentCoordinatorClient();
     1004#endif
     1005
    10041006#if USE(APPLE_INTERNAL_SDK)
    10051007#import <WebKitAdditions/WebViewInitialization.mm>
Note: See TracChangeset for help on using the changeset viewer.