diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h index cd9f7176e..16f8ea7a1 100644 --- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h +++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h @@ -27,33 +27,25 @@ #define WebIconDatabaseProxy_h #include "APIObject.h" - +#include "MessageReceiver.h" #include <WebCore/IconDatabaseBase.h> - #include <wtf/HashMap.h> #include <wtf/PassRefPtr.h> #include <wtf/RefPtr.h> #include <wtf/Vector.h> -namespace CoreIPC { -class Connection; -class MessageDecoder; -class MessageID; -} - namespace WebKit { class WebProcess; -class WebIconDatabaseProxy : public WebCore::IconDatabaseBase { +class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private CoreIPC::MessageReceiver { public: explicit WebIconDatabaseProxy(WebProcess*); virtual ~WebIconDatabaseProxy(); virtual bool isEnabled() const; void setEnabled(bool); - - + virtual void retainIconForPageURL(const String&); virtual void releaseIconForPageURL(const String&); virtual void setIconURLForPageURL(const String&, const String&); @@ -69,10 +61,12 @@ public: virtual void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>); void receivedIconLoadDecision(int decision, uint64_t callbackID); virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>); - - void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&); - + 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&); // Callbacks from the UIProcess |