diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.h | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h index eccbb8d60..ac6455250 100644 --- a/Source/WebKit2/WebProcess/WebProcess.h +++ b/Source/WebKit2/WebProcess/WebProcess.h @@ -95,6 +95,10 @@ struct WebPageGroupData; struct WebPreferencesStore; struct WebProcessCreationParameters; +#if ENABLE(NETWORK_PROCESS) +class NetworkProcessConnection; +#endif + #if USE(SECURITY_FRAMEWORK) class SecItemResponseData; class SecKeychainItemResponseData; @@ -188,11 +192,15 @@ public: WebSoupRequestManager& soupRequestManager() { return m_soupRequestManager; } #endif +#if ENABLE(NETWORK_PROCESS) + void networkProcessConnectionClosed(NetworkProcessConnection*); +#endif + private: WebProcess(); - void initializeWebProcess(const WebProcessCreationParameters&, CoreIPC::ArgumentDecoder*); - void platformInitializeWebProcess(const WebProcessCreationParameters&, CoreIPC::ArgumentDecoder*); + void initializeWebProcess(const WebProcessCreationParameters&, CoreIPC::MessageDecoder&); + void platformInitializeWebProcess(const WebProcessCreationParameters&, CoreIPC::MessageDecoder&); void platformTerminate(); void registerURLSchemeAsEmptyDocument(const String&); void registerURLSchemeAsSecure(const String&) const; @@ -228,7 +236,10 @@ private: void getSitesWithPluginData(const Vector<String>& pluginPaths, uint64_t callbackID); void clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID); #endif - + +#if ENABLE(NETWORK_PROCESS) + void networkProcessCrashed(CoreIPC::Connection*); +#endif #if ENABLE(PLUGIN_PROCESS) void pluginProcessCrashed(CoreIPC::Connection*, const String& pluginPath); #endif @@ -261,8 +272,8 @@ private: // CoreIPC::Connection::Client friend class WebConnectionToUIProcess; - virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); - virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, OwnPtr<CoreIPC::ArgumentEncoder>&); + virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&); + virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&); virtual void didClose(CoreIPC::Connection*); virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID); #if PLATFORM(WIN) @@ -270,13 +281,15 @@ private: #endif // CoreIPC::Connection::QueueClient - virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage) OVERRIDE; + virtual void didReceiveMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage) OVERRIDE; // Implemented in generated WebProcessMessageReceiver.cpp - void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); - void didReceiveWebProcessMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, bool& didHandleMessage); + void didReceiveWebProcessMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&); + void didReceiveWebProcessMessageOnConnectionWorkQueue(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, bool& didHandleMessage); +#if ENABLE(NETSCAPE_PLUGIN_API) void didGetPlugins(CoreIPC::Connection*, uint64_t requestID, const Vector<WebCore::PluginInfo>&); +#endif RefPtr<WebConnectionToUIProcess> m_connection; @@ -333,6 +346,12 @@ private: String m_localStorageDirectory; +#if ENABLE(NETWORK_PROCESS) + void ensureNetworkProcessConnection(); + RefPtr<NetworkProcessConnection> m_networkProcessConnection; + bool m_usesNetworkProcess; +#endif + #if ENABLE(PLUGIN_PROCESS) PluginProcessConnectionManager m_pluginProcessConnectionManager; #endif |