diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-22 15:40:17 +0200 |
| commit | 43a42f108af6bcbd91f2672731c3047c26213af1 (patch) | |
| tree | 7fa092e5f5d873c72f2486a70e26be26f7a38bec /Source/WebKit2/WebProcess/IconDatabase | |
| parent | d9cf437c840c6eb7417bdd97e6c40979255d3158 (diff) | |
| download | qtwebkit-43a42f108af6bcbd91f2672731c3047c26213af1.tar.gz | |
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)
New snapshot that fixes build without QtWidgets
Diffstat (limited to 'Source/WebKit2/WebProcess/IconDatabase')
| -rw-r--r-- | Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp | 4 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp index 217f1e80a..a04793eb4 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp @@ -143,9 +143,9 @@ void WebIconDatabaseProxy::urlImportFinished() { } -void WebIconDatabaseProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::ArgumentDecoder* arguments) +void WebIconDatabaseProxy::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::MessageID messageID, CoreIPC::MessageDecoder& decoder) { - didReceiveWebIconDatabaseProxyMessage(connection, messageID, arguments); + didReceiveWebIconDatabaseProxyMessage(connection, messageID, decoder); } } // namespace WebKit diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h index 2096aba4c..cd9f7176e 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h @@ -36,8 +36,8 @@ #include <wtf/Vector.h> namespace CoreIPC { -class ArgumentDecoder; class Connection; +class MessageDecoder; class MessageID; } @@ -70,10 +70,10 @@ public: void receivedIconLoadDecision(int decision, uint64_t callbackID); virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>); - void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); + void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&); private: - void didReceiveWebIconDatabaseProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*); + void didReceiveWebIconDatabaseProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&); // Callbacks from the UIProcess void urlImportFinished(); |
