Changeset 138655 in webkit


Ignore:
Timestamp:
Jan 2, 2013, 3:00:00 PM (12 years ago)
Author:
weinig@apple.com
Message:

Factor out NetworkProcess initialization into its own function in preparation of adding a NetworkProcess service
​https://bugs.webkit.org/show_bug.cgi?id=105946

Reviewed by Brady Eidson.

  • NetworkProcess/NetworkProcess.h:
  • NetworkProcess/mac/NetworkProcessInitialization.h: Added.

(NetworkProcessInitializationParameters):

  • NetworkProcess/mac/NetworkProcessInitialization.mm: Added.

(WebKit::initializeNetworkProcess):

  • NetworkProcess/mac/NetworkProcessMac.mm:

(WebKit::NetworkProcess::initializeSandbox):
(WebKit::NetworkProcess::platformInitialize):

  • NetworkProcess/mac/NetworkProcessMainMac.mm:

(WebKit::NetworkProcessMain):

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r138649 r138655  
     12013-01-02  Sam Weinig  <sam@webkit.org>
     2
     3        Factor out NetworkProcess initialization into its own function in preparation of adding a NetworkProcess service
     4        https://bugs.webkit.org/show_bug.cgi?id=105946
     5
     6        Reviewed by Brady Eidson.
     7
     8        * NetworkProcess/NetworkProcess.h:
     9        * NetworkProcess/mac/NetworkProcessInitialization.h: Added.
     10        (NetworkProcessInitializationParameters):
     11        * NetworkProcess/mac/NetworkProcessInitialization.mm: Added.
     12        (WebKit::initializeNetworkProcess):
     13        * NetworkProcess/mac/NetworkProcessMac.mm:
     14        (WebKit::NetworkProcess::initializeSandbox):
     15        (WebKit::NetworkProcess::platformInitialize):
     16        * NetworkProcess/mac/NetworkProcessMainMac.mm:
     17        (WebKit::NetworkProcessMain):
     18        * WebKit2.xcodeproj/project.pbxproj:
     19
    1202013-01-02  Sheriff Bot  <webkit.review.bot@gmail.com>
    221

  • trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h

    r138569 r138655  
    6565    }
    6666
     67    void initializeSandbox(const String& clientIdentifier);
    6768    void initialize(CoreIPC::Connection::Identifier, WebCore::RunLoop*);
    6869

  • trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm

    r137973 r138655  
    4747namespace WebKit {
    4848
     49void NetworkProcess::initializeSandbox(const String&)
     50{
     51    // FIXME: Initialize the sandbox.
     52}
     53
    4954void NetworkProcess::platformInitialize(const NetworkProcessCreationParameters& parameters)
    5055{
    … …  
    5964        [NSURLCache setSharedURLCache:parentProcessURLCache.get()];
    6065    }
    61 
    62     // FIXME: This should be moved to earlier in the setup process, as this won't work once sandboxing is enable.
    63     NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ Networking", "visible name of the network process. The argument is the application name."),
    64         (NSString *)parameters.parentProcessName];
    65    
    66     WKSetVisibleApplicationName((CFStringRef)applicationName);
    6766}
    6867

  • trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMainMac.mm

    r138413 r138655  
    3030
    3131#import "CommandLine.h"
    32 #import "EnvironmentUtilities.h"
    33 #import "NetworkProcess.h"
    34 #import "WebSystemInterface.h"
     32#import "NetworkProcessInitialization.h"
    3533#import <WebCore/RunLoop.h>
    3634#import <WebKitSystemInterface.h>
    3735#import <mach/mach_error.h>
    38 #import <runtime/InitializeThreading.h>
    3936#import <servers/bootstrap.h>
    4037#import <stdio.h>
    … …  
    8077#endif
    8178
    82     InitWebCoreSystemInterface();
    83     JSC::initializeThreading();
    84     WTF::initializeMainThread();
    85     RunLoop::initializeMainRunLoop();
     79    // FIXME: The Network process should not need to use AppKit, but right now, WebCore::RunLoop depends
     80    // on the outer most runloop being an AppKit runloop.
     81    [NSApplication sharedApplication];
    8682
    87     // Initialize the network process connection.
    88     NetworkProcess::shared().initialize(CoreIPC::Connection::Identifier(serverPort), RunLoop::main());
    89 
    90     [NSApplication sharedApplication];
     83    NetworkProcessInitializationParameters parameters;
     84    parameters.uiProcessName = commandLine["ui-process-name"];
     85    parameters.clientIdentifier = commandLine["client-identifier"];
     86    parameters.connectionIdentifier = serverPort;
     87    initializeNetworkProcess(parameters);
    9188
    9289    RunLoop::run();

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

    r138599 r138655  
    648648                BC111B5E112F629800337BAB /* WebEventFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC111B5C112F629800337BAB /* WebEventFactory.mm */; };
    649649                BC131BC911726C2800B69727 /* CoreIPCMessageKinds.h in Headers */ = {isa = PBXBuildFile; fileRef = BC131BC811726C2800B69727 /* CoreIPCMessageKinds.h */; };
     650                BC13E9771694E2D000BC6C00 /* NetworkProcessInitialization.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC13E9751694E2D000BC6C00 /* NetworkProcessInitialization.mm */; };
     651                BC13E9781694E2D000BC6C00 /* NetworkProcessInitialization.h in Headers */ = {isa = PBXBuildFile; fileRef = BC13E9761694E2D000BC6C00 /* NetworkProcessInitialization.h */; };
    650652                BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = BC14DF75120B5B7900826C0C /* InjectedBundleScriptWorld.h */; };
    651653                BC14DF78120B5B7900826C0C /* InjectedBundleScriptWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC14DF76120B5B7900826C0C /* InjectedBundleScriptWorld.cpp */; };
    … …  
    19161918                BC122FA61327087400F7EAC1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = PluginProcess/Info.plist; sourceTree = "<group>"; };
    19171919                BC131BC811726C2800B69727 /* CoreIPCMessageKinds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreIPCMessageKinds.h; sourceTree = "<group>"; };
     1920                BC13E9751694E2D000BC6C00 /* NetworkProcessInitialization.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetworkProcessInitialization.mm; sourceTree = "<group>"; };
     1921                BC13E9761694E2D000BC6C00 /* NetworkProcessInitialization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkProcessInitialization.h; sourceTree = "<group>"; };
    19181922                BC14DF75120B5B7900826C0C /* InjectedBundleScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundleScriptWorld.h; sourceTree = "<group>"; };
    19191923                BC14DF76120B5B7900826C0C /* InjectedBundleScriptWorld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundleScriptWorld.cpp; sourceTree = "<group>"; };
    … …  
    31773181                        isa = PBXGroup;
    31783182                        children = (
     3183                                BC13E9751694E2D000BC6C00 /* NetworkProcessInitialization.mm */,
     3184                                BC13E9761694E2D000BC6C00 /* NetworkProcessInitialization.h */,
    31793185                                51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */,
    31803186                                510CC7DD16138E2900D03ED3 /* NetworkProcessMainMac.mm */,
    … …  
    50335039                                BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */,
    50345040                                BCF4DE25168FA44800C94AFC /* WebContextSupplement.h in Headers */,
     5041                                BC13E9781694E2D000BC6C00 /* NetworkProcessInitialization.h in Headers */,
    50355042                        );
    50365043                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    60076014                                2989A411167D1834004F96D2 /* CustomProtocolManagerMac.mm in Sources */,
    60086015                                31A505F91680025500A930EB /* WebContextClient.cpp in Sources */,
     6016                                BC13E9771694E2D000BC6C00 /* NetworkProcessInitialization.mm in Sources */,
    60096017                        );
    60106018                        runOnlyForDeploymentPostprocessing = 0;
Note: See TracChangeset for help on using the changeset viewer.