Changeset 196500 in webkit


Ignore:
Timestamp:
Feb 12, 2016 1:25:56 PM (8 years ago)
Author:
andersca@apple.com
Message:

Remove more unneeded process launching code
​https://bugs.webkit.org/show_bug.cgi?id=154190

Reviewed by Tim Horton.

  • UIProcess/Databases/DatabaseProcessProxy.cpp:

(WebKit::DatabaseProcessProxy::getLaunchOptions): Deleted.

  • UIProcess/Databases/mac/DatabaseProcessProxyMac.mm: Removed.

(WebKit::DatabaseProcessProxy::platformGetLaunchOptions): Deleted.

  • UIProcess/Launcher/ProcessLauncher.h:
  • UIProcess/Network/NetworkProcessProxy.cpp:

(WebKit::NetworkProcessProxy::getLaunchOptions): Deleted.

  • UIProcess/Network/mac/NetworkProcessProxyMac.mm:

(WebKit::NetworkProcessProxy::platformGetLaunchOptions): Deleted.

  • UIProcess/Plugins/PluginProcessProxy.h:
  • UIProcess/Plugins/mac/PluginProcessProxyMac.mm:

(WebKit::PluginProcessProxy::pluginNeedsExecutableHeap): Deleted.
(WebKit::PluginProcessProxy::platformGetLaunchOptions): Deleted.

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::getLaunchOptions): Deleted.

  • UIProcess/mac/WebProcessProxyMac.mm:

(WebKit::WebProcessProxy::platformGetLaunchOptions): Deleted.

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
1 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r196499 r196500  
     12016-02-12  Anders Carlsson  <andersca@apple.com>
     2
     3        Remove more unneeded process launching code
     4        https://bugs.webkit.org/show_bug.cgi?id=154190
     5
     6        Reviewed by Tim Horton.
     7
     8        * UIProcess/Databases/DatabaseProcessProxy.cpp:
     9        (WebKit::DatabaseProcessProxy::getLaunchOptions): Deleted.
     10        * UIProcess/Databases/mac/DatabaseProcessProxyMac.mm: Removed.
     11        (WebKit::DatabaseProcessProxy::platformGetLaunchOptions): Deleted.
     12        * UIProcess/Launcher/ProcessLauncher.h:
     13        * UIProcess/Network/NetworkProcessProxy.cpp:
     14        (WebKit::NetworkProcessProxy::getLaunchOptions): Deleted.
     15        * UIProcess/Network/mac/NetworkProcessProxyMac.mm:
     16        (WebKit::NetworkProcessProxy::platformGetLaunchOptions): Deleted.
     17        * UIProcess/Plugins/PluginProcessProxy.h:
     18        * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
     19        (WebKit::PluginProcessProxy::pluginNeedsExecutableHeap): Deleted.
     20        (WebKit::PluginProcessProxy::platformGetLaunchOptions): Deleted.
     21        * UIProcess/WebProcessProxy.cpp:
     22        (WebKit::WebProcessProxy::getLaunchOptions): Deleted.
     23        * UIProcess/mac/WebProcessProxyMac.mm:
     24        (WebKit::WebProcessProxy::platformGetLaunchOptions): Deleted.
     25        * WebKit2.xcodeproj/project.pbxproj:
     26
    1272016-02-12  Anders Carlsson  <andersca@apple.com>
    228

  • trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp

    r196499 r196500  
    6969    launchOptions.processType = ProcessLauncher::ProcessType::Database;
    7070    ChildProcessProxy::getLaunchOptions(launchOptions);
    71     platformGetLaunchOptions(launchOptions);
    7271}
    7372

  • trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h

    r196499 r196500  
    6161        ProcessType processType;
    6262        HashMap<String, String> extraInitializationData;
    63 #if OS(DARWIN) && !PLATFORM(GTK)
    64         static const cpu_type_t MatchCurrentArchitecture = 0;
    65         cpu_type_t architecture;
    66         bool executableHeap;
    67 #endif
    68 #if PLATFORM(EFL) || PLATFORM(GTK)
    69 #ifndef NDEBUG
     63
     64#if (PLATFORM(EFL) || PLATFORM(GTK)) && !defined(NDEBUG)
    7065        String processCmdPrefix;
    71 #endif
    7266#endif
    7367    };

  • trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp

    r196499 r196500  
    8383    launchOptions.processType = ProcessLauncher::ProcessType::Network;
    8484    ChildProcessProxy::getLaunchOptions(launchOptions);
    85     platformGetLaunchOptions(launchOptions);
    8685}
    8786

  • trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm

    r196491 r196500  
    4141}
    4242
    43 void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
    44 {
    45     launchOptions.architecture = ProcessLauncher::LaunchOptions::MatchCurrentArchitecture;
    46     launchOptions.executableHeap = false;
    47 }
    48 
    4943} // namespace WebKit

  • trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h

    r186059 r196500  
    8787#if PLATFORM(COCOA)
    8888    void setProcessSuppressionEnabled(bool);
    89 
    90     // Returns whether the plug-in needs the heap to be marked executable.
    91     static bool pluginNeedsExecutableHeap(const PluginModuleInfo&);
    9289
    9390#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000

  • trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm

    r196499 r196500  
    6060namespace WebKit {
    6161   
    62 bool PluginProcessProxy::pluginNeedsExecutableHeap(const PluginModuleInfo& pluginInfo)
    63 {
    64     static const bool forceNonexecutableHeapForPlugins = [[NSUserDefaults standardUserDefaults] boolForKey:@"ForceNonexecutableHeapForPlugins"];
    65     if (forceNonexecutableHeapForPlugins)
    66         return false;
    67    
    68     if (pluginInfo.bundleIdentifier == "com.apple.QuickTime Plugin.plugin")
    69         return false;
    70 
    71     // We only allow 32-bit plug-ins to have the heap marked executable.
    72     if (pluginInfo.pluginArchitecture == CPU_TYPE_X86)
    73         return true;
    74 
    75     return false;
    76 }
    77 
    7862#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
    7963bool PluginProcessProxy::createPropertyListFile(const PluginModuleInfo& plugin)
    … …  
    119103        launchOptions.processType = ProcessLauncher::ProcessType::Plugin64;
    120104
    121     launchOptions.architecture = pluginProcessAttributes.moduleInfo.pluginArchitecture;
    122     launchOptions.executableHeap = PluginProcessProxy::pluginNeedsExecutableHeap(pluginProcessAttributes.moduleInfo);
    123105    launchOptions.extraInitializationData.add("plugin-path", pluginProcessAttributes.moduleInfo.path);
    124106

  • trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

    r196499 r196500  
    147147        launchOptions.extraInitializationData.add(ASCIILiteral("OverrideLanguages"), languageString.toString());
    148148    }
    149 
    150     platformGetLaunchOptions(launchOptions);
    151149}
    152150

  • trunk/Source/WebKit2/UIProcess/ios/WebProcessProxyIOS.mm

    r196491 r196500  
    4141}
    4242
    43 void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
    44 {
    45     // We want the web process to match the architecture of the UI process.
    46     launchOptions.architecture = ProcessLauncher::LaunchOptions::MatchCurrentArchitecture;
    47     launchOptions.executableHeap = false;
    48 }
    49 
    5043} // namespace WebKit
    5144

  • trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm

    r196491 r196500  
    3838}
    3939
    40 void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
    41 {
    42     // We want the web process to match the architecture of the UI process.
    43     launchOptions.architecture = ProcessLauncher::LaunchOptions::MatchCurrentArchitecture;
    44     launchOptions.executableHeap = false;
    45 }
    46 
    4740} // namespace WebKit
    4841

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

    r196488 r196500  
    950950                517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */; };
    951951                517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */; };
    952                 517DD5C5180DC3E10081660B /* DatabaseProcessProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */; };
    953952                51834592134532E90092B696 /* WebIconDatabaseClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 51834590134532E80092B696 /* WebIconDatabaseClient.cpp */; };
    954953                51834593134532E90092B696 /* WebIconDatabaseClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 51834591134532E80092B696 /* WebIconDatabaseClient.h */; };
    … …  
    29562955                517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseProcessProxy.cpp; path = Databases/DatabaseProcessProxy.cpp; sourceTree = "<group>"; };
    29572956                517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseProcessProxy.h; path = Databases/DatabaseProcessProxy.h; sourceTree = "<group>"; };
    2958                 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DatabaseProcessProxyMac.mm; path = Databases/mac/DatabaseProcessProxyMac.mm; sourceTree = "<group>"; };
    29592957                51834590134532E80092B696 /* WebIconDatabaseClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebIconDatabaseClient.cpp; sourceTree = "<group>"; };
    29602958                51834591134532E80092B696 /* WebIconDatabaseClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebIconDatabaseClient.h; sourceTree = "<group>"; };
    … …  
    32763274                93E6A4ED1BC5DD3900F8A0E7 /* _WKHitTestResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKHitTestResult.h; sourceTree = "<group>"; };
    32773275                990D28A71C6404B000986977 /* _WKAutomationSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAutomationSession.h; sourceTree = "<group>"; };
     3276                990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAutomationSessionDelegate.h; sourceTree = "<group>"; };
    32783277                990D28AD1C65190400986977 /* _WKAutomationSession.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKAutomationSession.mm; sourceTree = "<group>"; };
    3279                 990D28A81C6404B000986977 /* _WKAutomationSessionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAutomationSessionDelegate.h; sourceTree = "<group>"; };
    32803278                990D28AF1C65203900986977 /* _WKAutomationSessionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKAutomationSessionInternal.h; sourceTree = "<group>"; };
    32813279                990D28B31C6526D400986977 /* APIAutomationSessionClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIAutomationSessionClient.h; sourceTree = "<group>"; };
    … …  
    53865384                        isa = PBXGroup;
    53875385                        children = (
    5388                                 517DD5C3180DC3D60081660B /* mac */,
    53895386                                517DD5BC180DA7D30081660B /* DatabaseProcessProxy.cpp */,
    53905387                                517DD5BD180DA7D30081660B /* DatabaseProcessProxy.h */,
    … …  
    54025399                        );
    54035400                        path = mac;
    5404                         sourceTree = "<group>";
    5405                 };
    5406                 517DD5C3180DC3D60081660B /* mac */ = {
    5407                         isa = PBXGroup;
    5408                         children = (
    5409                                 517DD5C4180DC3E10081660B /* DatabaseProcessProxyMac.mm */,
    5410                         );
    5411                         name = mac;
    54125401                        sourceTree = "<group>";
    54135402                };
    … …  
    88038792                                512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */,
    88048793                                517DD5BE180DA7D30081660B /* DatabaseProcessProxy.cpp in Sources */,
    8805                                 517DD5C5180DC3E10081660B /* DatabaseProcessProxyMac.mm in Sources */,
    88068794                                512A9769180E09B80039A149 /* DatabaseProcessProxyMessageReceiver.cpp in Sources */,
    88078795                                51E35209180F5D6B00E53BE9 /* DatabaseServiceEntryPoint.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.