From d441d6f39bb846989d95bcf5caf387b42414718d Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 13 Sep 2013 12:51:20 +0200 Subject: Import Qt5x2 branch of QtWebkit for Qt 5.2 Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen --- .../WebProcess/IconDatabase/WebIconDatabaseProxy.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp') 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 iconData, const String& iconURL) { CoreIPC::DataReference data(reinterpret_cast(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 -- cgit v1.2.1