diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:09:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-22 09:10:13 +0100 |
| commit | 470286ecfe79d59df14944e5b5d34630fc739391 (patch) | |
| tree | 43983212872e06cebefd2ae474418fa2908ca54c /Source/WebKit2/UIProcess/WebProcessProxy.h | |
| parent | 23037105e948c2065da5a937d3a2396b0ff45c1e (diff) | |
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)
Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/UIProcess/WebProcessProxy.h')
| -rw-r--r-- | Source/WebKit2/UIProcess/WebProcessProxy.h | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.h b/Source/WebKit2/UIProcess/WebProcessProxy.h index a0120ef5a..4c9996125 100644 --- a/Source/WebKit2/UIProcess/WebProcessProxy.h +++ b/Source/WebKit2/UIProcess/WebProcessProxy.h @@ -26,6 +26,7 @@ #ifndef WebProcessProxy_h #define WebProcessProxy_h +#include "MessageReceiverMap.h" #include "PlatformProcessIdentifier.h" #include "PluginInfoStore.h" #include "ProcessLauncher.h" @@ -39,6 +40,10 @@ #include <wtf/PassRefPtr.h> #include <wtf/RefCounted.h> +#if ENABLE(CUSTOM_PROTOCOLS) +#include "CustomProtocolManagerProxy.h" +#endif + namespace WebCore { class KURL; }; @@ -55,7 +60,7 @@ class WebContext; class WebPageGroup; struct WebNavigationDataStore; -class WebProcessProxy : public ThreadSafeRefCounted<WebProcessProxy>, CoreIPC::Connection::Client, ResponsivenessTimer::Client, ProcessLauncher::Client, CoreIPC::Connection::QueueClient { +class WebProcessProxy : public ThreadSafeRefCounted<WebProcessProxy>, CoreIPC::Connection::Client, ResponsivenessTimer::Client, ProcessLauncher::Client, CoreIPC::Connection::QueueClient { public: typedef HashMap<uint64_t, RefPtr<WebFrameProxy> > WebFrameProxyMap; typedef HashMap<uint64_t, RefPtr<WebBackForwardListItem> > WebBackForwardListItemMap; @@ -73,10 +78,14 @@ public: CoreIPC::Connection* connection() const { ASSERT(m_connection); - - return m_connection->connection(); + return m_connection.get(); } - WebConnection* webConnection() const { return m_connection.get(); } + + 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); + + WebConnection* webConnection() const { return m_webConnection.get(); } WebContext* context() const { return m_context.get(); } @@ -198,9 +207,10 @@ private: ResponsivenessTimer m_responsivenessTimer; - // This is not a CoreIPC::Connection so that we can wrap the CoreIPC::Connection in - // an API object. - RefPtr<WebConnectionToWebProcess> m_connection; + + RefPtr<CoreIPC::Connection> m_connection; + RefPtr<WebConnectionToWebProcess> m_webConnection; + CoreIPC::MessageReceiverMap m_messageReceiverMap; Vector<std::pair<CoreIPC::Connection::OutgoingMessage, unsigned> > m_pendingMessages; RefPtr<ProcessLauncher> m_processLauncher; @@ -213,6 +223,10 @@ private: HashMap<uint64_t, WebPageProxy*> m_pageMap; WebFrameProxyMap m_frameMap; WebBackForwardListItemMap m_backForwardListItemMap; + +#if ENABLE(CUSTOM_PROTOCOLS) + CustomProtocolManagerProxy m_customProtocolManagerProxy; +#endif }; template<typename T> |