⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286606 in webkit


Ignore:
Timestamp:
Dec 7, 2021, 12:29:32 PM (5 years ago)
Author:
Russell Epstein
Message:

Cherry-pick r286564. rdar://problem/86052131

Put webpushd code in WebKit.framework.
​https://bugs.webkit.org/show_bug.cgi?id=233886

Reviewed by Alex Christensen.

This fixes some build/mastering/linking issues.

  • Configurations/webpushd.xcconfig:
  • Shared/API/Cocoa/WKMain.h:
  • Shared/API/Cocoa/WKMain.mm: (WKWebPushDaemonMain):
  • WebKit.xcodeproj/project.pbxproj:
  • webpushd/WebPushDaemonMain.h: Copied from Source/WebKit/Shared/API/Cocoa/WKMain.mm.
  • webpushd/WebPushDaemonMain.mm: (WebKit::WebPushDaemonMain): (main): Deleted.
  • webpushd/webpushd.cpp: Copied from Source/WebKit/Shared/API/Cocoa/WKMain.mm. (main):

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

Location:
branches/safari-613.1.11-branch/Source/WebKit
Files:
6 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/safari-613.1.11-branch/Source/WebKit/ChangeLog

    r286533 r286606  
     12021-12-06  Alan Coon  <alancoon@apple.com>
     2
     3        Cherry-pick r286564. rdar://problem/86052131
     4
     5    Put webpushd code in WebKit.framework.
     6    https://bugs.webkit.org/show_bug.cgi?id=233886
     7   
     8    Reviewed by Alex Christensen.
     9   
     10    This fixes some build/mastering/linking issues.
     11   
     12    * Configurations/webpushd.xcconfig:
     13    * Shared/API/Cocoa/WKMain.h:
     14    * Shared/API/Cocoa/WKMain.mm:
     15    (WKWebPushDaemonMain):
     16    * WebKit.xcodeproj/project.pbxproj:
     17    * webpushd/WebPushDaemonMain.h: Copied from Source/WebKit/Shared/API/Cocoa/WKMain.mm.
     18    * webpushd/WebPushDaemonMain.mm:
     19    (WebKit::WebPushDaemonMain):
     20    (main): Deleted.
     21    * webpushd/webpushd.cpp: Copied from Source/WebKit/Shared/API/Cocoa/WKMain.mm.
     22    (main):
     23   
     24    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286564 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     25
     26    2021-12-06  Brady Eidson  <beidson@apple.com>
     27
     28            Put webpushd code in WebKit.framework.
     29            https://bugs.webkit.org/show_bug.cgi?id=233886
     30
     31            Reviewed by Alex Christensen.
     32
     33            This fixes some build/mastering/linking issues.
     34
     35            * Configurations/webpushd.xcconfig:
     36            * Shared/API/Cocoa/WKMain.h:
     37            * Shared/API/Cocoa/WKMain.mm:
     38            (WKWebPushDaemonMain):
     39            * WebKit.xcodeproj/project.pbxproj:
     40            * webpushd/WebPushDaemonMain.h: Copied from Source/WebKit/Shared/API/Cocoa/WKMain.mm.
     41            * webpushd/WebPushDaemonMain.mm:
     42            (WebKit::WebPushDaemonMain):
     43            (main): Deleted.
     44            * webpushd/webpushd.cpp: Copied from Source/WebKit/Shared/API/Cocoa/WKMain.mm.
     45            (main):
     46
    1472021-12-04  Brady Eidson  <beidson@apple.com>
    248

  • branches/safari-613.1.11-branch/Source/WebKit/Configurations/webpushd.xcconfig

    r284250 r286606  
    2626PRODUCT_NAME = webpushd;
    2727
    28 OTHER_LDFLAGS = -l WTF -framework Foundation -framework CoreFoundation;
     28OTHER_LDFLAGS = -framework WebKit;
    2929LIBRARY_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR);
    3030

  • branches/safari-613.1.11-branch/Source/WebKit/Shared/API/Cocoa/WKMain.h

    r284383 r286606  
    3535WK_EXPORT int WKXPCServiceMain(int argc, const char** argv) WK_API_AVAILABLE(macos(10.15), ios(13.0));
    3636WK_EXPORT int WKAdAttributionDaemonMain(int argc, const char** argv) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     37WK_EXPORT int WKWebPushDaemonMain(int argc, const char** argv) WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    3738
    3839#ifdef __cplusplus

  • branches/safari-613.1.11-branch/Source/WebKit/Shared/API/Cocoa/WKMain.mm

    r284383 r286606  
    2828
    2929#import "PCMDaemonEntryPoint.h"
     30#import "WebPushDaemonMain.h"
    3031#import "XPCServiceEntryPoint.h"
    3132
    … …  
    3940    return WebKit::PCMDaemonMain(argc, argv);
    4041}
     42
     43int WKWebPushDaemonMain(int argc, const char** argv)
     44{
     45    return WebKit::WebPushDaemonMain(argc, argv);
     46}

  • branches/safari-613.1.11-branch/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r286533 r286606  
    968968                512CD6982721EFC800F7F8EC /* WebPushDaemonConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 512CD6972721EFC300F7F8EC /* WebPushDaemonConnection.h */; };
    969969                512CD69A2721F0A900F7F8EC /* WebPushDaemonConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 512CD6992721F04900F7F8EC /* WebPushDaemonConstants.h */; };
    970                 512CD69F2723393A00F7F8EC /* WebPushDaemon.h in Headers */ = {isa = PBXBuildFile; fileRef = 512CD69D2723393A00F7F8EC /* WebPushDaemon.h */; };
    971                 512CD6A02723393A00F7F8EC /* WebPushDaemon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 512CD69E2723393A00F7F8EC /* WebPushDaemon.mm */; };
    972970                512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
    973971                512ECC3527196ADB00089B66 /* PrivateClickMeasurementConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CB930FE26E802160032B1C0 /* PrivateClickMeasurementConnection.h */; };
    … …  
    10081006                515BE1B31D5902DD00DD7C68 /* GamepadData.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1B01D59006900DD7C68 /* GamepadData.h */; };
    10091007                515BE1B51D5917FF00DD7C68 /* UIGamepad.h in Headers */ = {isa = PBXBuildFile; fileRef = 515BE1AD1D555C5100DD7C68 /* UIGamepad.h */; };
    1010                 5160E955274B887200567388 /* AppBundleRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E953274B887100567388 /* AppBundleRequest.mm */; };
    1011                 5160E956274B887200567388 /* AppBundleRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E954274B887100567388 /* AppBundleRequest.h */; };
    1012                 5160E959274C0D8900567388 /* PushAppBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E957274C0D8800567388 /* PushAppBundle.h */; };
    1013                 5160E95A274C0D8900567388 /* PushAppBundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E958274C0D8800567388 /* PushAppBundle.mm */; };
    1014                 5160E95E274C2A0300567388 /* MockAppBundleRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E95C274C2A0300567388 /* MockAppBundleRegistry.h */; };
    1015                 5160E960274C2A4000567388 /* MockAppBundleRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E95F274C2A3F00567388 /* MockAppBundleRegistry.mm */; };
    10161008                5163199416289A6000E22F00 /* NetworkProcessMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51ACC9341628064800342550 /* NetworkProcessMessageReceiver.cpp */; };
    10171009                5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
    … …  
    10271019                517B5F65275A8D7F002DC22D /* WebPushToolMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F64275A8D7E002DC22D /* WebPushToolMain.mm */; };
    10281020                517B5F68275A9A78002DC22D /* WebPushToolConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F67275A9A78002DC22D /* WebPushToolConnection.mm */; };
     1021                517B5F73275E9609002DC22D /* WebPushDaemonMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 517B5F72275E9609002DC22D /* WebPushDaemonMain.h */; };
     1022                517B5F78275E9795002DC22D /* webpushd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517B5F77275E9795002DC22D /* webpushd.cpp */; };
     1023                517B5F79275E97A1002DC22D /* WebPushDaemonMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C157A0B2717CA1C00ED5280 /* WebPushDaemonMain.mm */; };
     1024                517B5F7A275E97A4002DC22D /* WebPushDaemon.mm in Sources */ = {isa = PBXBuildFile; fileRef = 512CD69E2723393A00F7F8EC /* WebPushDaemon.mm */; };
     1025                517B5F7B275E97A9002DC22D /* PushClientConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F7BB7A2744C50700C45A72 /* PushClientConnection.mm */; };
     1026                517B5F7C275E97B6002DC22D /* MockAppBundleForTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F7BB75274498BB00C45A72 /* MockAppBundleForTesting.h */; };
     1027                517B5F7D275E97B6002DC22D /* PushClientConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F7BB792744C50700C45A72 /* PushClientConnection.h */; };
     1028                517B5F7E275E97B6002DC22D /* AppBundleRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E953274B887100567388 /* AppBundleRequest.mm */; };
     1029                517B5F7F275E97B6002DC22D /* WebPushDaemon.h in Headers */ = {isa = PBXBuildFile; fileRef = 512CD69D2723393A00F7F8EC /* WebPushDaemon.h */; };
     1030                517B5F80275E97B6002DC22D /* MockAppBundleRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E95C274C2A0300567388 /* MockAppBundleRegistry.h */; };
     1031                517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E957274C0D8800567388 /* PushAppBundle.h */; };
     1032                517B5F82275E97B6002DC22D /* PushAppBundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E958274C0D8800567388 /* PushAppBundle.mm */; };
     1033                517B5F84275E97B6002DC22D /* MockAppBundleForTesting.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F7BB74274498BA00C45A72 /* MockAppBundleForTesting.mm */; };
     1034                517B5F85275E97B6002DC22D /* AppBundleRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 5160E954274B887100567388 /* AppBundleRequest.h */; };
     1035                517B5F86275E97B6002DC22D /* MockAppBundleRegistry.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5160E95F274C2A3F00567388 /* MockAppBundleRegistry.mm */; };
    10291036                517CF0E3163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */; };
    10301037                517CF0E3163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */; };
    … …  
    10691076                51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3282F /* WebMDNSRegisterMessageReceiver.cpp */; };
    10701077                51F060E11654318500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51F060DD1654317500F3283F /* NetworkMDNSRegisterMessageReceiver.cpp */; };
    1071                 51F7BB76274498BB00C45A72 /* MockAppBundleForTesting.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F7BB74274498BA00C45A72 /* MockAppBundleForTesting.mm */; };
    1072                 51F7BB77274498BB00C45A72 /* MockAppBundleForTesting.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F7BB75274498BB00C45A72 /* MockAppBundleForTesting.h */; };
    1073                 51F7BB7B2744C50700C45A72 /* PushClientConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F7BB792744C50700C45A72 /* PushClientConnection.h */; };
    1074                 51F7BB7C2744C50700C45A72 /* PushClientConnection.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51F7BB7A2744C50700C45A72 /* PushClientConnection.mm */; };
    10751078                51F7BB7D2745640400C45A72 /* CodeSigning.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE11AD4F1CBC47F800681EE5 /* CodeSigning.mm */; };
    10761079                51F7BB7F274564A100C45A72 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 51F7BB7E274564A100C45A72 /* Security.framework */; };
    … …  
    12271230                5C1579FF2717B6D200ED5280 /* DaemonDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1579E927172A8B00ED5280 /* DaemonDecoder.cpp */; };
    12281231                5C157A012717B7FB00ED5280 /* ArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */; };
    1229                 5C157A0C2717CA1D00ED5280 /* WebPushDaemonMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C157A0B2717CA1C00ED5280 /* WebPushDaemonMain.mm */; };
    12301232                5C19A5201FD0B29500EEA323 /* URLSchemeTaskParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C19A51F1FD0B14700EEA323 /* URLSchemeTaskParameters.h */; };
    12311233                5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C20CB9E1BB0DD1800895BB1 /* NetworkSession.h */; };
    … …  
    44074409                517CF0E1163A486C00C2950F /* CacheStorageEngineConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CacheStorageEngineConnectionMessageReceiver.cpp; path = DerivedSources/WebKit2/CacheStorageEngineConnectionMessageReceiver.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    44084410                517CF0E2163A486C00C2950E /* NetworkProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessConnectionMessages.h; path = DerivedSources/WebKit2/NetworkProcessConnectionMessages.h; sourceTree = BUILT_PRODUCTS_DIR; };
     4411                517B5F72275E9609002DC22D /* WebPushDaemonMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPushDaemonMain.h; sourceTree = "<group>"; };
     4412                517B5F77275E9795002DC22D /* webpushd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webpushd.cpp; sourceTree = "<group>"; };
    44094413                518324782615B00D003F239E /* NetworkSchemeURLProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkSchemeURLProtocol.h; sourceTree = "<group>"; };
    44104414                518324792615B00D003F239E /* NetworkSchemeURLProtocol.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkSchemeURLProtocol.mm; sourceTree = "<group>"; };
    … …  
    99429946                        isa = PBXGroup;
    99439947                        children = (
     9948                                517B5F77275E9795002DC22D /* webpushd.cpp */,
    99449949                                517B5F63275A8D5C002DC22D /* webpushtool */,
    99459950                                5160E954274B887100567388 /* AppBundleRequest.h */,
    … …  
    99579962                                512CD69E2723393A00F7F8EC /* WebPushDaemon.mm */,
    99589963                                5C157A0B2717CA1C00ED5280 /* WebPushDaemonMain.mm */,
     9964                                517B5F72275E9609002DC22D /* WebPushDaemonMain.h */,
    99599965                        );
    99609966                        path = webpushd;
    … …  
    1251212518                        buildActionMask = 2147483647;
    1251312519                        files = (
    12514                                 5160E956274B887200567388 /* AppBundleRequest.h in Headers */,
    1251512520                                5C1579FC2717AF5000ED5280 /* DaemonUtilities.h in Headers */,
    12516                                 51F7BB77274498BB00C45A72 /* MockAppBundleForTesting.h in Headers */,
    12517                                 5160E95E274C2A0300567388 /* MockAppBundleRegistry.h in Headers */,
    12518                                 5160E959274C0D8900567388 /* PushAppBundle.h in Headers */,
    12519                                 51F7BB7B2744C50700C45A72 /* PushClientConnection.h in Headers */,
    12520                                 512CD69F2723393A00F7F8EC /* WebPushDaemon.h in Headers */,
    1252112521                                517B5F2F2757382B002DC22D /* WebPushDaemonConnectionConfiguration.h in Headers */,
    1252212522                        );
    … …  
    1259112591                                994C6042253CA54400BDF060 /* _WKInspectorConfiguration.h in Headers */,
    1259212592                                994C6045253CABA200BDF060 /* _WKInspectorConfigurationInternal.h in Headers */,
     12593                                517B5F7F275E97B6002DC22D /* WebPushDaemon.h in Headers */,
    1259312594                                991F492F23A812C60054642B /* _WKInspectorDebuggableInfo.h in Headers */,
    1259412595                                99036AE223A949CF0000B06A /* _WKInspectorDebuggableInfoInternal.h in Headers */,
    … …  
    1299412995                                832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h in Headers */,
    1299512996                                E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */,
     12997                                517B5F7C275E97B6002DC22D /* MockAppBundleForTesting.h in Headers */,
    1299612998                                8310428B1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h in Headers */,
    1299712999                                513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */,
    … …  
    1312813130                                1D4D737123A9E56200717A25 /* RemoteMediaResourceManagerMessages.h in Headers */,
    1312913131                                1D4D737623A9ED1800717A25 /* RemoteMediaResourceManagerMessagesReplies.h in Headers */,
     13132                                517B5F85275E97B6002DC22D /* AppBundleRequest.h in Headers */,
    1313013133                                1DD2A68525633C6700FF7B6F /* RemoteMediaSourceProxyMessages.h in Headers */,
    1313113134                                1DD2A68825633C9500FF7B6F /* RemoteMediaSourceProxyMessagesReplies.h in Headers */,
    … …  
    1322013223                                448AC24E267135A700B28921 /* SynapseSPI.h in Headers */,
    1322113224                                4459984222833E8700E61373 /* SyntheticEditingCommandType.h in Headers */,
     13225                                517B5F7D275E97B6002DC22D /* PushClientConnection.h in Headers */,
    1322213226                                3157135F2040A9B20084F9CF /* SystemPreviewController.h in Headers */,
    1322313227                                079D1D9A26960CD300883577 /* SystemStatusSPI.h in Headers */,
    … …  
    1324413248                                5C19A5201FD0B29500EEA323 /* URLSchemeTaskParameters.h in Headers */,
    1324513249                                1AC1336818565B5700F3EC05 /* UserData.h in Headers */,
     13250                                517B5F80275E97B6002DC22D /* MockAppBundleRegistry.h in Headers */,
    1324613251                                CD491B081E70D05F00009066 /* UserMediaCaptureManager.h in Headers */,
    1324713252                                CD491B0E1E732E4D00009066 /* UserMediaCaptureManagerMessages.h in Headers */,
    … …  
    1372113726                                9ACC07B925C8218400DC6386 /* WKMediaKeySystemPermissionCallback.h in Headers */,
    1372213727                                1AB40EE61BF677E300BA81BE /* WKMenuItemIdentifiersPrivate.h in Headers */,
     13728                                517B5F81275E97B6002DC22D /* PushAppBundle.h in Headers */,
    1372313729                                5CABDC8622C40FDE001EDE8E /* WKMessageListener.h in Headers */,
    1372413730                                C11E1694212B87C500985FF6 /* WKMockDisplay.h in Headers */,
    … …  
    1378613792                                93BDEB01171DD7AF00BFEE1B /* WKPageLoadTypesPrivate.h in Headers */,
    1378713793                                2D7303791A7C2B7500F8F487 /* WKPageNavigationClient.h in Headers */,
     13794                                517B5F73275E9609002DC22D /* WebPushDaemonMain.h in Headers */,
    1378813795                                1AB8A1EE18400ACB00E9AE69 /* WKPagePolicyClient.h in Headers */,
    1378913796                                373CEAD81859553F008C363D /* WKPagePolicyClientInternal.h in Headers */,
    … …  
    1508515092                        buildActionMask = 2147483647;
    1508615093                        files = (
    15087                                 5160E955274B887200567388 /* AppBundleRequest.mm in Sources */,
    1508815094                                5C157A012717B7FB00ED5280 /* ArgumentCoders.cpp in Sources */,
    1508915095                                51F7BB7D2745640400C45A72 /* CodeSigning.mm in Sources */,
    1509015096                                5C1579FF2717B6D200ED5280 /* DaemonDecoder.cpp in Sources */,
    1509115097                                5C1579FE2717B6C100ED5280 /* DaemonEncoder.cpp in Sources */,
     15098                                517B5F78275E9795002DC22D /* webpushd.cpp in Sources */,
    1509215099                                5C1579FB2717AF5000ED5280 /* DaemonUtilities.mm in Sources */,
    15093                                 51F7BB76274498BB00C45A72 /* MockAppBundleForTesting.mm in Sources */,
    15094                                 5160E960274C2A4000567388 /* MockAppBundleRegistry.mm in Sources */,
    15095                                 5160E95A274C0D8900567388 /* PushAppBundle.mm in Sources */,
    15096                                 51F7BB7C2744C50700C45A72 /* PushClientConnection.mm in Sources */,
    15097                                 512CD6A02723393A00F7F8EC /* WebPushDaemon.mm in Sources */,
    15098                                 5C157A0C2717CA1D00ED5280 /* WebPushDaemonMain.mm in Sources */,
    1509915100                        );
    1510015101                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1514715148                                512F58A212A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp in Sources */,
    1514815149                                57FABB132581827C0059DC95 /* AuthenticationServicesCoreSoftLink.mm in Sources */,
     15150                                517B5F7E275E97B6002DC22D /* AppBundleRequest.mm in Sources */,
    1514915151                                9955A6F41C7986DC00EB6A93 /* AutomationBackendDispatchers.cpp in Sources */,
    1515015152                                99249AD51F1F1E5600B62FBB /* AutomationFrontendDispatchers.cpp in Sources */,
    … …  
    1522815230                                CD3EEF462579C261006563BB /* RemoteMediaEngineConfigurationFactoryProxyMessageReceiver.cpp in Sources */,
    1522915231                                0792314B239CBCB8009598E2 /* RemoteMediaPlayerManagerProxyMessageReceiver.cpp in Sources */,
     15232                                517B5F7A275E97A4002DC22D /* WebPushDaemon.mm in Sources */,
    1523015233                                0701789E23BE9CFC005F0FAA /* RemoteMediaPlayerMIMETypeCache.cpp in Sources */,
    1523115234                                071BC58F23CE1EAA00680D7C /* RemoteMediaPlayerProxyMessageReceiver.cpp in Sources */,
    … …  
    1526815271                                2D11B7562126A282006F8878 /* UnifiedSource3.cpp in Sources */,
    1526915272                                2D11B7572126A282006F8878 /* UnifiedSource4-mm.mm in Sources */,
     15273                                517B5F84275E97B6002DC22D /* MockAppBundleForTesting.mm in Sources */,
     15274                                517B5F86275E97B6002DC22D /* MockAppBundleRegistry.mm in Sources */,
    1527015275                                2D11B7582126A282006F8878 /* UnifiedSource4.cpp in Sources */,
    1527115276                                2D11B7592126A282006F8878 /* UnifiedSource5-mm.mm in Sources */,
    … …  
    1535015355                                2D11B7A82126A283006F8878 /* UnifiedSource44.cpp in Sources */,
    1535115356                                2D11B7A92126A283006F8878 /* UnifiedSource45-mm.mm in Sources */,
     15357                                517B5F82275E97B6002DC22D /* PushAppBundle.mm in Sources */,
    1535215358                                2D11B7AA2126A283006F8878 /* UnifiedSource45.cpp in Sources */,
    1535315359                                2D11B7AB2126A283006F8878 /* UnifiedSource46-mm.mm in Sources */,
    … …  
    1538015386                                2D11B7C62126A283006F8878 /* UnifiedSource59.cpp in Sources */,
    1538115387                                2D11B7C72126A283006F8878 /* UnifiedSource60-mm.mm in Sources */,
     15388                                517B5F79275E97A1002DC22D /* WebPushDaemonMain.mm in Sources */,
    1538215389                                2D11B7C82126A283006F8878 /* UnifiedSource60.cpp in Sources */,
    1538315390                                2D54C31A212F3B330049C174 /* UnifiedSource61-mm.mm in Sources */,
    … …  
    1538715394                                2D54C308212F3B330049C174 /* UnifiedSource63-mm.mm in Sources */,
    1538815395                                2D11B7CC2126A283006F8878 /* UnifiedSource63.cpp in Sources */,
     15396                                517B5F7B275E97A9002DC22D /* PushClientConnection.mm in Sources */,
    1538915397                                2D54C30C212F3B330049C174 /* UnifiedSource64-mm.mm in Sources */,
    1539015398                                2D11B7CD2126A283006F8878 /* UnifiedSource64.cpp in Sources */,

  • branches/safari-613.1.11-branch/Source/WebKit/webpushd/WebPushDaemonMain.h

    r286561 r286606  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2021 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import "config.h"
    27 #import "WKMain.h"
     26#pragma once
    2827
    29 #import "PCMDaemonEntryPoint.h"
    30 #import "XPCServiceEntryPoint.h"
     28namespace WebKit {
    3129
    32 int WKXPCServiceMain(int argc, const char** argv)
    33 {
    34     return WebKit::XPCServiceMain(argc, argv);
    35 }
     30int WebPushDaemonMain(int, const char**);
    3631
    37 int WKAdAttributionDaemonMain(int argc, const char** argv)
    38 {
    39     return WebKit::PCMDaemonMain(argc, argv);
    40 }
     32} // namespace WebKit

  • branches/safari-613.1.11-branch/Source/WebKit/webpushd/WebPushDaemonMain.mm

    r286075 r286606  
    2525
    2626#import "config.h"
     27#import "WebPushDaemonMain.h"
     28
    2729#import "DaemonConnection.h"
    2830#import "DaemonDecoder.h"
    … …  
    5658} // namespace WebPushD
    5759
    58 int main(int argc, const char** argv)
     60using WebPushD::connectionEventHandler;
     61using WebPushD::connectionAdded;
     62using WebPushD::connectionRemoved;
     63
     64namespace WebKit {
     65
     66int WebPushDaemonMain(int argc, const char** argv)
    5967{
    6068    if (argc != 3 || strcmp(argv[1], "--machServiceName")) {
    … …  
    6573
    6674    @autoreleasepool {
    67         WebKit::startListeningForMachServiceConnections(machServiceName, "com.apple.private.webkit.webpush", WebPushD::connectionAdded, WebPushD::connectionRemoved, WebPushD::connectionEventHandler);
     75        WebKit::startListeningForMachServiceConnections(machServiceName, "com.apple.private.webkit.webpush", connectionAdded, connectionRemoved, connectionEventHandler);
    6876        WTF::initializeMainThread();
    6977    }
    … …  
    7179    return 0;
    7280}
     81
     82} // namespace WebKit

  • branches/safari-613.1.11-branch/Source/WebKit/webpushd/webpushd.cpp

    r286561 r286606  
    11/*
    2  * Copyright (C) 2019 Apple Inc. All rights reserved.
     2 * Copyright (C) 2021 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2424 */
    2525
    26 #import "config.h"
    27 #import "WKMain.h"
     26#include <WebKit/WKMain.h>
     27#include <os/availability.h>
    2828
    29 #import "PCMDaemonEntryPoint.h"
    30 #import "XPCServiceEntryPoint.h"
    31 
    32 int WKXPCServiceMain(int argc, const char** argv)
     29int main(int argc, const char** argv)
    3330{
    34     return WebKit::XPCServiceMain(argc, argv);
     31    WKWebPushDaemonMain(argc, argv);
    3532}
    36 
    37 int WKAdAttributionDaemonMain(int argc, const char** argv)
    38 {
    39     return WebKit::PCMDaemonMain(argc, argv);
    40 }
Note: See TracChangeset for help on using the changeset viewer.