diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h | |
parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h')
-rw-r--r-- | Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h index 75b2f27a6..3144a43b6 100644 --- a/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h +++ b/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h @@ -57,6 +57,9 @@ public: static const cpu_type_t MatchCurrentArchitecture = 0; cpu_type_t architecture; bool executableHeap; +#if HAVE(XPC) + bool useXPC; +#endif #endif #ifndef NDEBUG String processCmdPrefix; @@ -75,11 +78,11 @@ public: void invalidate(); static bool getProcessTypeFromString(const char*, ProcessType&); + static const char* processTypeAsString(ProcessType); + private: ProcessLauncher(Client*, const LaunchOptions& launchOptions); - static const char* processTypeAsString(ProcessType); - void launchProcess(); void didFinishLaunchingProcess(PlatformProcessIdentifier, CoreIPC::Connection::Identifier); |