diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/WebProcess/WebProcess.h | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h index 88b5f5799..0b3c0fb99 100644 --- a/Source/WebKit2/WebProcess/WebProcess.h +++ b/Source/WebKit2/WebProcess/WebProcess.h @@ -72,6 +72,10 @@ QT_END_NAMESPACE #include "WebNotificationManager.h" #endif +#if ENABLE(NETWORK_PROCESS) +#include "WebResourceLoadScheduler.h" +#endif + #if ENABLE(PLUGIN_PROCESS) #include "PluginProcessConnectionManager.h" #endif @@ -115,6 +119,9 @@ public: WebCore::RunLoop* runLoop() const { return m_runLoop; } void addMessageReceiver(CoreIPC::StringReference messageReceiverName, CoreIPC::MessageReceiver*); + void addMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID, CoreIPC::MessageReceiver*); + + void removeMessageReceiver(CoreIPC::StringReference messageReceiverName, uint64_t destinationID); WebConnectionToUIProcess* webConnectionToUIProcess() const { return m_connection.get(); } @@ -196,7 +203,10 @@ public: #endif #if ENABLE(NETWORK_PROCESS) + NetworkProcessConnection* networkConnection(); void networkProcessConnectionClosed(NetworkProcessConnection*); + bool usesNetworkProcess() const { return m_usesNetworkProcess; } + WebResourceLoadScheduler& webResourceLoadScheduler() { return m_webResourceLoadScheduler; } #endif private: @@ -278,7 +288,7 @@ private: 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); + virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName) OVERRIDE; #if PLATFORM(WIN) virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply(); #endif @@ -354,6 +364,7 @@ private: void ensureNetworkProcessConnection(); RefPtr<NetworkProcessConnection> m_networkProcessConnection; bool m_usesNetworkProcess; + WebResourceLoadScheduler m_webResourceLoadScheduler; #endif #if ENABLE(PLUGIN_PROCESS) |