Changeset 240956 in webkit


Ignore:
Timestamp:
Feb 4, 2019, 5:31:31 PM (6 years ago)
Author:
achristensen@apple.com
Message:

Move XPCService main to a shared file calling a C function
​https://bugs.webkit.org/show_bug.cgi?id=194256

Reviewed by Brady Eidson.

This not only reduces a few kilobytes of duplicated binary from the XPCService executables,
It will allow me to introduce a new kind of executable which will need to parse argv and call a different C function.
This is similar to r236075 but more general.

  • Shared/API/Cocoa/WKMain.h: Added.
  • Shared/API/Cocoa/WKMain.mm: Added.

(WKXPCServiceMain):

  • Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp: Added.

(main):

  • Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:

(main): Deleted.

  • SourcesCocoa.txt:
  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r240955 r240956  
     12019-02-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Move XPCService main to a shared file calling a C function
     4        https://bugs.webkit.org/show_bug.cgi?id=194256
     5
     6        Reviewed by Brady Eidson.
     7
     8        This not only reduces a few kilobytes of duplicated binary from the XPCService executables,
     9        It will allow me to introduce a new kind of executable which will need to parse argv and call a different C function.
     10        This is similar to r236075 but more general.
     11
     12        * Shared/API/Cocoa/WKMain.h: Added.
     13        * Shared/API/Cocoa/WKMain.mm: Added.
     14        (WKXPCServiceMain):
     15        * Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp: Added.
     16        (main):
     17        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:
     18        (main): Deleted.
     19        * SourcesCocoa.txt:
     20        * WebKit.xcodeproj/project.pbxproj:
     21
    1222019-02-04  Alex Christensen  <achristensen@webkit.org>
    223

  • trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm

    r239709 r240956  
    160160
    161161} // namespace WebKit
    162 
    163 int main(int argc, const char** argv)
    164 {
    165     return WebKit::XPCServiceMain(argc, argv);
    166 }

  • trunk/Source/WebKit/SourcesCocoa.txt

    r240885 r240956  
    109109Shared/API/Cocoa/RemoteObjectRegistry.mm
    110110Shared/API/Cocoa/WKBrowsingContextHandle.mm
     111Shared/API/Cocoa/WKMain.mm
    111112Shared/API/Cocoa/WKRemoteObject.mm
    112113Shared/API/Cocoa/WKRemoteObjectCoder.mm

  • trunk/Source/WebKit/UnifiedSources-input.xcfilelist

    r240685 r240956  
    117117$(SRCROOT)/Shared/API/APIURLRequest.cpp
    118118$(SRCROOT)/Shared/API/APIURLResponse.cpp
     119$(SRCROOT)/Shared/API/Cocoa/WKMain.mm
    119120$(SRCROOT)/Shared/API/Cocoa/RemoteObjectInvocation.mm
    120121$(SRCROOT)/Shared/API/Cocoa/RemoteObjectRegistry.mm

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

    r240885 r240956  
    793793                371E69591AED7A0F00495E48 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
    794794                372CAF0B1833FD910040AC27 /* WKNSError.h in Headers */ = {isa = PBXBuildFile; fileRef = 372CAF091833FD910040AC27 /* WKNSError.h */; };
    795                 372EBB3C2017E64300085064 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
    796795                372EBB3E2017E64300085064 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC3DE46815A91763008D26FC /* Foundation.framework */; };
    797796                372EBB3F2017E64300085064 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* WebKit.framework */; };
    … …  
    10621061                5C359C0D2154739F009E7948 /* WKDeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C359C0C21547321009E7948 /* WKDeprecated.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10631062                5C4B9D8B210A8CCF008F14D1 /* UndoOrRedo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */; };
     1063                5C5CEC30220911C700D6BBB0 /* WKMain.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5CEC2E2209114800D6BBB0 /* WKMain.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1064                5C5CEC32220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
     1065                5C5CEC33220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
     1066                5C5CEC34220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
     1067                5C5CEC35220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */; };
    10641068                5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    10651069                5C7FB47021E97DC5009E3241 /* WebCookieJar.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C7FB46F21E97C0C009E3241 /* WebCookieJar.h */; };
    … …  
    13071311                A58B6F0818FCA733008CBA53 /* WKFileUploadPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */; };
    13081312                A5C0F0A72000654D00536536 /* _WKNSWindowExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0A62000654400536536 /* _WKNSWindowExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1309                 A5C0F0AB2000658200536536 /* _WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* _WKInspectorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1313                A5C0F0AB2000658200536536 /* WKInspectorWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0AA2000656E00536536 /* _WKInspectorWindow.h */; settings = {ATTRIBUTES = (Private, ); }; };
    13101314                A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E391FC2183C1E900C8FB31 /* InspectorTargetProxy.h */; };
    13111315                A5EC6AD42151BD7B00677D17 /* WebPageDebuggable.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EC6AD32151BD6900677D17 /* WebPageDebuggable.h */; };
    … …  
    14121416                BC5750971268F3C6006F0F12 /* WebPopupMenuProxyMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5750951268F3C6006F0F12 /* WebPopupMenuProxyMac.h */; };
    14131417                BC5C75C814954DA600BC4775 /* WKConnectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */; };
    1414                 BC5D24AB16CC3D62007D5461 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
    1415                 BC5D24AE16CC3D65007D5461 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
    1416                 BC5D24AF16CC3D66007D5461 /* XPCServiceMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC82839616B47EC400A278FE /* XPCServiceMain.mm */; };
    14171418                BC5D24C216CD706D007D5461 /* WKDOMNodePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5D24C116CD706D007D5461 /* WKDOMNodePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    14181419                BC5D24C516CD7088007D5461 /* WKDOMRangePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5D24C416CD7088007D5461 /* WKDOMRangePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    34463447                5C46C0AE21B71AE200BC5991 /* _WKWebsiteDataStoreConfigurationInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebsiteDataStoreConfigurationInternal.h; sourceTree = "<group>"; };
    34473448                5C4B9D8A210A8C46008F14D1 /* UndoOrRedo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UndoOrRedo.h; sourceTree = "<group>"; };
     3449                5C5CEC2E2209114800D6BBB0 /* WKMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKMain.h; sourceTree = "<group>"; };
     3450                5C5CEC2F2209117E00D6BBB0 /* WKMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKMain.mm; sourceTree = "<group>"; };
     3451                5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuxiliaryProcessMain.cpp; path = Cocoa/AuxiliaryProcessMain.cpp; sourceTree = "<group>"; };
    34483452                5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKURLSchemeTaskPrivate.h; sourceTree = "<group>"; };
    34493453                5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImplCocoa.mm; sourceTree = "<group>"; };
    … …  
    62966300                                F409BA171E6E64B3009DA28E /* WKDragDestinationAction.h */,
    62976301                                37DFA6FF1810BB92001F4A9F /* WKFoundation.h */,
     6302                                5C5CEC2E2209114800D6BBB0 /* WKMain.h */,
     6303                                5C5CEC2F2209117E00D6BBB0 /* WKMain.mm */,
    62986304                                1A9E32991822E1CC00F5D04C /* WKRemoteObject.h */,
    62996305                                1A9E32981822E1CC00F5D04C /* WKRemoteObject.mm */,
    … …  
    80248030                        children = (
    80258031                                BC82836B16B3587900A278FE /* XPCService */,
     8032                                5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */,
    80268033                        );
    80278034                        path = EntryPointUtilities;
    … …  
    88598866                                5CAFDE452130846300B1F7E1 /* _WKInspector.h in Headers */,
    88608867                                5CAFDE472130846A00B1F7E1 /* _WKInspectorInternal.h in Headers */,
     8868                                A5C0F0AB2000658200536536 /* _WKInspectorWindow.h in Headers */,
    88618869                                A5C0F0AB2000658200536536 /* _WKInspectorWindow.h in Headers */,
    88628870                                31B362952141EBCD007BFA53 /* _WKInternalDebugFeature.h in Headers */,
    … …  
    97569764                                6EE849C81368D9390038D481 /* WKInspectorPrivateMac.h in Headers */,
    97579765                                994BADF41F7D781400B571E7 /* WKInspectorViewController.h in Headers */,
    9758                                 A5C0F0AB2000658200536536 /* WKInspectorWindow.h in Headers */,
    97599766                                A518B5D21FE1D55B00F9FA28 /* WKInspectorWKWebView.h in Headers */,
    97609767                                2DD5E129210ADC7B00DB6012 /* WKKeyboardScrollingAnimator.h in Headers */,
    … …  
    97629769                                2D790A9F1AD7164900AB90B3 /* WKLayoutMode.h in Headers */,
    97639770                                2DA1E4FE18C02B6A00DBC929 /* WKLegacyPDFView.h in Headers */,
     9771                                5C5CEC30220911C700D6BBB0 /* WKMain.h in Headers */,
    97649772                                C98C48AA1B6FD5B500145103 /* WKMediaSessionFocusManager.h in Headers */,
    97659773                                C9CD439D1B4B024F00239E33 /* WKMediaSessionMetadata.h in Headers */,
    … …  
    1076510773                        buildActionMask = 2147483647;
    1076610774                        files = (
    10767                                 372EBB3C2017E64300085064 /* XPCServiceMain.mm in Sources */,
     10775                                5C5CEC34220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
    1076810776                        );
    1076910777                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1113711145                        buildActionMask = 2147483647;
    1113811146                        files = (
    11139                                 BC5D24AF16CC3D66007D5461 /* XPCServiceMain.mm in Sources */,
     11147                                5C5CEC35220912B400D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
    1114011148                        );
    1114111149                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1114511153                        buildActionMask = 2147483647;
    1114611154                        files = (
    11147                                 BC5D24AE16CC3D65007D5461 /* XPCServiceMain.mm in Sources */,
     11155                                5C5CEC33220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
    1114811156                        );
    1114911157                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    1115311161                        buildActionMask = 2147483647;
    1115411162                        files = (
    11155                                 BC5D24AB16CC3D62007D5461 /* XPCServiceMain.mm in Sources */,
     11163                                5C5CEC32220912B300D6BBB0 /* AuxiliaryProcessMain.cpp in Sources */,
    1115611164                        );
    1115711165                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.