From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 25 Aug 2016 19:20:41 +0300 Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443) Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f Reviewed-by: Konstantin Tokarev --- .../WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 d40ac3344..33fe587e4 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp @@ -30,6 +30,7 @@ #include "WebIconDatabaseMessages.h" #include "WebIconDatabaseProxyMessages.h" #include "WebProcess.h" +#include "WebProcessProxyMessages.h" #include #include @@ -45,7 +46,7 @@ WebIconDatabaseProxy::WebIconDatabaseProxy(WebProcess* process) : m_isEnabled(false) , m_process(process) { - m_process->addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), this); + m_process->addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), *this); } bool WebIconDatabaseProxy::isEnabled() const @@ -64,17 +65,17 @@ void WebIconDatabaseProxy::setEnabled(bool enabled) void WebIconDatabaseProxy::retainIconForPageURL(const String& pageURL) { - m_process->parentProcessConnection()->send(Messages::WebIconDatabase::RetainIconForPageURL(pageURL), 0); + m_process->parentProcessConnection()->send(Messages::WebProcessProxy::RetainIconForPageURL(pageURL), 0); } void WebIconDatabaseProxy::releaseIconForPageURL(const String& pageURL) { - m_process->parentProcessConnection()->send(Messages::WebIconDatabase::ReleaseIconForPageURL(pageURL), 0); + m_process->parentProcessConnection()->send(Messages::WebProcessProxy::ReleaseIconForPageURL(pageURL), 0); } Image* WebIconDatabaseProxy::synchronousIconForPageURL(const String& pageURL, const IntSize& /*size*/) { - CoreIPC::DataReference result; + IPC::DataReference result; if (!m_process->parentProcessConnection()->sendSync(Messages::WebIconDatabase::SynchronousIconDataForPageURL(pageURL), Messages::WebIconDatabase::SynchronousIconDataForPageURL::Reply(result), 0)) return 0; @@ -135,7 +136,7 @@ void WebIconDatabaseProxy::setIconURLForPageURL(const String& iconURL, const Str void WebIconDatabaseProxy::setIconDataForIconURL(PassRefPtr iconData, const String& iconURL) { - CoreIPC::DataReference data(reinterpret_cast(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0); + IPC::DataReference data(reinterpret_cast(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0); m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0); } -- cgit v1.2.1