diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-11 10:03:25 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-11 10:03:25 +0100 |
| commit | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (patch) | |
| tree | b318cf594dc1da2fa48224005945c9157f35bb41 /Source/WebKit2/WebProcess/WebProcess.h | |
| parent | 6300a96eca9f152b379f1bcf3d9efdc5572d989a (diff) | |
| download | qtwebkit-d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9.tar.gz | |
Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3 (http://svn.webkit.org/repository/webkit/trunk@104681)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h index b6fff7f2f..1e50284c0 100644 --- a/Source/WebKit2/WebProcess/WebProcess.h +++ b/Source/WebKit2/WebProcess/WebProcess.h @@ -73,6 +73,11 @@ struct WebPageGroupData; struct WebPreferencesStore; struct WebProcessCreationParameters; +#if PLATFORM(MAC) +class SecItemResponseData; +class SecKeychainItemResponseData; +#endif + class WebProcess : public ChildProcess, private CoreIPC::Connection::QueueClient { public: static WebProcess& shared(); @@ -182,7 +187,7 @@ private: #endif #if ENABLE(PLUGIN_PROCESS) - void pluginProcessCrashed(const String& pluginPath); + void pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath); #endif void startMemorySampler(const SandboxExtension::Handle&, const String&, const double); @@ -199,6 +204,11 @@ private: void getWebCoreStatistics(uint64_t callbackID); void garbageCollectJavaScriptObjects(); +#if PLATFORM(MAC) + void secItemResponse(CoreIPC::Connection*, uint64_t requestID, const SecItemResponseData&); + void secKeychainItemResponse(CoreIPC::Connection*, uint64_t requestID, const SecKeychainItemResponseData&); +#endif + // ChildProcess virtual bool shouldTerminate(); virtual void terminate(); |