diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/IconDatabase')
| -rw-r--r-- | Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp | 17 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h | 7 |
2 files changed, 8 insertions, 16 deletions
diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp index c9360b3ee..d40ac3344 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp @@ -64,18 +64,18 @@ void WebIconDatabaseProxy::setEnabled(bool enabled) void WebIconDatabaseProxy::retainIconForPageURL(const String& pageURL) { - m_process->connection()->send(Messages::WebIconDatabase::RetainIconForPageURL(pageURL), 0); + m_process->parentProcessConnection()->send(Messages::WebIconDatabase::RetainIconForPageURL(pageURL), 0); } void WebIconDatabaseProxy::releaseIconForPageURL(const String& pageURL) { - m_process->connection()->send(Messages::WebIconDatabase::ReleaseIconForPageURL(pageURL), 0); + m_process->parentProcessConnection()->send(Messages::WebIconDatabase::ReleaseIconForPageURL(pageURL), 0); } Image* WebIconDatabaseProxy::synchronousIconForPageURL(const String& pageURL, const IntSize& /*size*/) { CoreIPC::DataReference result; - if (!m_process->connection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0)) + if (!m_process->parentProcessConnection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0)) return 0; // FIXME: Return Image created with the above data. @@ -114,7 +114,7 @@ void WebIconDatabaseProxy::loadDecisionForIconURL(const String& iconURL, PassRef uint64_t id = callback->callbackID(); m_iconLoadDecisionCallbacks.add(id, callback); - m_process->connection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0); + m_process->parentProcessConnection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0); } void WebIconDatabaseProxy::receivedIconLoadDecision(int decision, uint64_t callbackID) @@ -130,22 +130,17 @@ void WebIconDatabaseProxy::iconDataForIconURL(const String& /*iconURL*/, PassRef void WebIconDatabaseProxy::setIconURLForPageURL(const String& iconURL, const String& pageURL) { - m_process->connection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0); + m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0); } void WebIconDatabaseProxy::setIconDataForIconURL(PassRefPtr<SharedBuffer> iconData, const String& iconURL) { CoreIPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0); - m_process->connection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0); + m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0); } void WebIconDatabaseProxy::urlImportFinished() { } -void WebIconDatabaseProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder) -{ - didReceiveWebIconDatabaseProxyMessage(connection, messageID, decoder); -} - } // namespace WebKit diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h index 16f8ea7a1..3a99ad570 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h @@ -64,10 +64,7 @@ public: private: // CoreIPC::MessageReceiver - void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&) OVERRIDE; - - // Implemented in generated WebIconDatabaseProxyMessageReceiver.cpp - void didReceiveWebIconDatabaseProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&); + void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE; // Callbacks from the UIProcess void urlImportFinished(); @@ -75,7 +72,7 @@ private: bool m_isEnabled; WebProcess* m_process; - HashMap<uint64_t, RefPtr<WebCore::IconLoadDecisionCallback> > m_iconLoadDecisionCallbacks; + HashMap<uint64_t, RefPtr<WebCore::IconLoadDecisionCallback>> m_iconLoadDecisionCallbacks; }; } // namespace WebKit |