diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebKit2/UIProcess/WebProcessProxy.cpp | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebKit2/UIProcess/WebProcessProxy.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/WebProcessProxy.cpp | 61 |
1 files changed, 19 insertions, 42 deletions
diff --git a/Source/WebKit2/UIProcess/WebProcessProxy.cpp b/Source/WebKit2/UIProcess/WebProcessProxy.cpp index 8a48724..a8ae574 100644 --- a/Source/WebKit2/UIProcess/WebProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/WebProcessProxy.cpp @@ -37,7 +37,6 @@ #include "WebPageProxy.h" #include "WebProcessMessages.h" #include "WebProcessProxyMessages.h" -#include "WebProcessProxyMessageKinds.h" #include <WebCore/KURL.h> #include <wtf/text/CString.h> #include <wtf/text/WTFString.h> @@ -59,12 +58,12 @@ static uint64_t generatePageID() return uniquePageID++; } -PassRefPtr<WebProcessProxy> WebProcessProxy::create(WebContext* context) +PassRefPtr<WebProcessProxy> WebProcessProxy::create(PassRefPtr<WebContext> context) { return adoptRef(new WebProcessProxy(context)); } -WebProcessProxy::WebProcessProxy(WebContext* context) +WebProcessProxy::WebProcessProxy(PassRefPtr<WebContext> context) : m_responsivenessTimer(this) , m_context(context) { @@ -163,17 +162,17 @@ void WebProcessProxy::terminate() WebPageProxy* WebProcessProxy::webPage(uint64_t pageID) const { - return m_pageMap.get(pageID).get(); + return m_pageMap.get(pageID); } -WebPageProxy* WebProcessProxy::createWebPage(PageClient* pageClient, WebContext* context, WebPageGroup* pageGroup) +PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient* pageClient, WebContext* context, WebPageGroup* pageGroup) { ASSERT(context->process() == this); unsigned pageID = generatePageID(); - RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, context, pageGroup, pageID); - m_pageMap.set(pageID, webPage); - return webPage.get(); + RefPtr<WebPageProxy> webPage = WebPageProxy::create(pageClient, this, pageGroup, pageID); + m_pageMap.set(pageID, webPage.get()); + return webPage.release(); } void WebProcessProxy::addExistingWebPage(WebPageProxy* webPage, uint64_t pageID) @@ -186,21 +185,6 @@ void WebProcessProxy::removeWebPage(uint64_t pageID) m_pageMap.remove(pageID); } -WebProcessProxy::pages_const_iterator WebProcessProxy::pages_begin() -{ - return m_pageMap.begin().values(); -} - -WebProcessProxy::pages_const_iterator WebProcessProxy::pages_end() -{ - return m_pageMap.end().values(); -} - -size_t WebProcessProxy::numberOfPages() -{ - return m_pageMap.size(); -} - WebBackForwardListItem* WebProcessProxy::webBackForwardItem(uint64_t itemID) const { return m_backForwardListItemMap.get(itemID).get(); @@ -232,9 +216,14 @@ void WebProcessProxy::addBackForwardItem(uint64_t itemID, const String& original } #if ENABLE(PLUGIN_PROCESS) -void WebProcessProxy::getPluginProcessConnection(const String& pluginPath, CoreIPC::ArgumentEncoder* reply) +void WebProcessProxy::getPluginProcessConnection(const String& pluginPath, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply) { - PluginProcessManager::shared().getPluginProcessConnection(pluginPath, this, reply); + PluginProcessManager::shared().getPluginProcessConnection(context()->pluginInfoStore(), pluginPath, reply); +} + +void WebProcessProxy::pluginSyncMessageSendTimedOut(const String& pluginPath) +{ + PluginProcessManager::shared().pluginSyncMessageSendTimedOut(pluginPath); } #endif @@ -276,22 +265,6 @@ CoreIPC::SyncReplyMode WebProcessProxy::didReceiveSyncMessage(CoreIPC::Connectio if (messageID.is<CoreIPC::MessageClassWebProcessProxy>()) return didReceiveSyncWebProcessProxyMessage(connection, messageID, arguments, reply); -#if ENABLE(PLUGIN_PROCESS) - if (messageID.is<CoreIPC::MessageClassWebProcessProxyLegacy>()) { - switch (messageID.get<WebProcessProxyLegacyMessage::Kind>()) { - case WebProcessProxyLegacyMessage::GetPluginProcessConnection: { - String pluginPath; - - if (!arguments->decode(CoreIPC::Out(pluginPath))) - return CoreIPC::AutomaticReply; - - getPluginProcessConnection(pluginPath, reply); - return CoreIPC::ManualReply; - } - } - } -#endif - if (messageID.is<CoreIPC::MessageClassWebContext>() || messageID.is<CoreIPC::MessageClassWebContextLegacy>() || messageID.is<CoreIPC::MessageClassDownloadProxy>() || messageID.is<CoreIPC::MessageClassWebIconDatabase>()) return m_context->didReceiveSyncMessage(connection, messageID, arguments, reply); @@ -331,6 +304,10 @@ void WebProcessProxy::didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::Me terminate(); } +void WebProcessProxy::syncMessageSendTimedOut(CoreIPC::Connection*) +{ +} + void WebProcessProxy::didBecomeUnresponsive(ResponsivenessTimer*) { Vector<RefPtr<WebPageProxy> > pages; @@ -364,7 +341,7 @@ void WebProcessProxy::didFinishLaunching(CoreIPC::Connection::Identifier connect m_connection = CoreIPC::Connection::createServerConnection(connectionIdentifier, this, RunLoop::main()); #if PLATFORM(MAC) m_connection->setShouldCloseConnectionOnMachExceptions(); -#elif PLATFORM(QT) +#elif PLATFORM(QT) || PLATFORM(GTK) m_connection->setShouldCloseConnectionOnProcessTermination(processIdentifier()); #endif |