Changeset 240973 in webkit


Ignore:
Timestamp:
Feb 5, 2019, 7:36:02 AM (6 years ago)
Author:
achristensen@apple.com
Message:

Add Networking Daemon skeleton
​https://bugs.webkit.org/show_bug.cgi?id=194278

Reviewed by Zalan Bujtas.

Daemon skeletons? This is spooky stuff.

  • NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.h: Added.
  • NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm: Added.

(WebKit::DaemonMain):

  • NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
  • NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:

(WebKit::NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded):

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

(WKDaemonMain):

  • Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp:

(main):

  • SourcesCocoa.txt:
  • UnifiedSources-input.xcfilelist:
  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r240965 r240973  
     12019-02-04  Alex Christensen  <achristensen@webkit.org>
     2
     3        Add Networking Daemon skeleton
     4        https://bugs.webkit.org/show_bug.cgi?id=194278
     5
     6        Reviewed by Zalan Bujtas.
     7
     8        Daemon skeletons? This is spooky stuff.
     9
     10        * NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.h: Added.
     11        * NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm: Added.
     12        (WebKit::DaemonMain):
     13        * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
     14        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
     15        (WebKit::NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded):
     16        * Shared/API/Cocoa/WKMain.h:
     17        * Shared/API/Cocoa/WKMain.mm:
     18        (WKDaemonMain):
     19        * Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp:
     20        (main):
     21        * SourcesCocoa.txt:
     22        * UnifiedSources-input.xcfilelist:
     23        * WebKit.xcodeproj/project.pbxproj:
     24
    1252019-02-04  Yusuke Suzuki  <ysuzuki@apple.com>
    226

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h

    r239749 r240973  
    3838namespace WebKit {
    3939
     40class Download;
    4041class NetworkSessionCocoa;
    4142

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm

    r240437 r240973  
    264264}
    265265
    266 void NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded(ResourceRequest& request, bool shouldBlockCookies)
     266void NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded(WebCore::ResourceRequest& request, bool shouldBlockCookies)
    267267{
    268268    if (shouldBlockCookies || (m_session->sessionID().isEphemeral() && isThirdPartyRequest(request)))

  • trunk/Source/WebKit/Shared/API/Cocoa/WKMain.h

    r240956 r240973  
    3434
    3535WK_EXPORT int WKXPCServiceMain(int argc, const char** argv) WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
     36WK_EXPORT int WKDaemonMain(int argc, const char** argv) WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
    3637
    3738#ifdef __cplusplus

  • trunk/Source/WebKit/Shared/API/Cocoa/WKMain.mm

    r240956 r240973  
    2727#include "WKMain.h"
    2828
     29#include "DaemonEntryPoint.h"
    2930#include "XPCServiceEntryPoint.h"
    3031
    … …  
    3334    return WebKit::XPCServiceMain(argc, argv);
    3435}
     36
     37int WKDaemonMain(int argc, const char** argv)
     38{
     39    return WebKit::DaemonMain(argc, argv);
     40}

  • trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/AuxiliaryProcessMain.cpp

    r240956 r240973  
    2828int main(int argc, const char** argv)
    2929{
     30    if (argc >= 2 && strstr(argv[1], "Daemon"))
     31        return WKDaemonMain(argc, argv);
    3032    return WKXPCServiceMain(argc, argv);
    3133}

  • trunk/Source/WebKit/SourcesCocoa.txt

    r240956 r240973  
    4040NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
    4141
     42NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm
    4243NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
    4344

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

    r240956 r240973  
    1313$(SRCROOT)/NetworkProcess/Downloads/PendingDownload.cpp
    1414$(SRCROOT)/NetworkProcess/Downloads/cocoa/DownloadCocoa.mm
    15 $(SRCROOT)/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
     15$(SRCROOT)/NetworkProcess/EntryPoint/Cocoa/Daemon/DaemonEntryPoint.mm
     16$(SRCROOT)/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
    1617$(SRCROOT)/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
    1718$(SRCROOT)/NetworkProcess/IndexedDB/WebIDBConnectionToClient.cpp

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

    r240956 r240973  
    13111311                A58B6F0818FCA733008CBA53 /* WKFileUploadPanel.h in Headers */ = {isa = PBXBuildFile; fileRef = A58B6F0618FCA733008CBA53 /* WKFileUploadPanel.h */; };
    13121312                A5C0F0A72000654D00536536 /* _WKNSWindowExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = A5C0F0A62000654400536536 /* _WKNSWindowExtras.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1313                 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, ); }; };
    13141314                A5E391FD2183C1F800C8FB31 /* InspectorTargetProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E391FC2183C1E900C8FB31 /* InspectorTargetProxy.h */; };
    13151315                A5EC6AD42151BD7B00677D17 /* WebPageDebuggable.h in Headers */ = {isa = PBXBuildFile; fileRef = A5EC6AD32151BD6900677D17 /* WebPageDebuggable.h */; };
    … …  
    34503450                5C5CEC2F2209117E00D6BBB0 /* WKMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKMain.mm; sourceTree = "<group>"; };
    34513451                5C5CEC31220912AF00D6BBB0 /* AuxiliaryProcessMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AuxiliaryProcessMain.cpp; path = Cocoa/AuxiliaryProcessMain.cpp; sourceTree = "<group>"; };
     3452                5C5CEC382209583200D6BBB0 /* DaemonEntryPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DaemonEntryPoint.h; sourceTree = "<group>"; };
     3453                5C5CEC392209583200D6BBB0 /* DaemonEntryPoint.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DaemonEntryPoint.mm; sourceTree = "<group>"; };
    34523454                5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKURLSchemeTaskPrivate.h; sourceTree = "<group>"; };
    34533455                5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImplCocoa.mm; sourceTree = "<group>"; };
    … …  
    68596861                        sourceTree = "<group>";
    68606862                };
     6863                5C5CEC372209581B00D6BBB0 /* Daemon */ = {
     6864                        isa = PBXGroup;
     6865                        children = (
     6866                                5C5CEC382209583200D6BBB0 /* DaemonEntryPoint.h */,
     6867                                5C5CEC392209583200D6BBB0 /* DaemonEntryPoint.mm */,
     6868                        );
     6869                        name = Daemon;
     6870                        path = Cocoa/Daemon;
     6871                        sourceTree = "<group>";
     6872                };
    68616873                5C74300C21500434004BFA17 /* API */ = {
    68626874                        isa = PBXGroup;
    … …  
    80498061                        isa = PBXGroup;
    80508062                        children = (
     8063                                5C5CEC372209581B00D6BBB0 /* Daemon */,
    80518064                                BC8283A116B4BD9100A278FE /* XPCService */,
    80528065                        );
Note: See TracChangeset for help on using the changeset viewer.