Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 17 insertions, 17 deletions

diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
index f4dd4ab72..376b2be69 100644
--- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
+++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
@@ -38,33 +38,33 @@ namespace WebKit {
 
 class WebProcess;
 
-class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private CoreIPC::MessageReceiver {
+class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private IPC::MessageReceiver {
 public:
     explicit WebIconDatabaseProxy(WebProcess*);
     virtual ~WebIconDatabaseProxy();
 
-    virtual bool isEnabled() const;
-    void setEnabled(bool);
+    virtual bool isEnabled() const override;
+    void setEnabled(bool) override;
 
-    virtual void retainIconForPageURL(const String&);
-    virtual void releaseIconForPageURL(const String&);
-    virtual void setIconURLForPageURL(const String&, const String&);
-    virtual void setIconDataForIconURL(PassRefPtr<WebCore::SharedBuffer>, const String&);
+    virtual void retainIconForPageURL(const String&) override;
+    virtual void releaseIconForPageURL(const String&) override;
+    virtual void setIconURLForPageURL(const String&, const String&) override;
+    virtual void setIconDataForIconURL(PassRefPtr<WebCore::SharedBuffer>, const String&) override;
 
-    virtual String synchronousIconURLForPageURL(const String&);
-    virtual bool synchronousIconDataKnownForIconURL(const String&);
-    virtual WebCore::IconLoadDecision synchronousLoadDecisionForIconURL(const String&, WebCore::DocumentLoader*);
-    virtual WebCore::Image* synchronousIconForPageURL(const String&, const WebCore::IntSize&);
+    virtual String synchronousIconURLForPageURL(const String&) override;
+    virtual bool synchronousIconDataKnownForIconURL(const String&) override;
+    virtual WebCore::IconLoadDecision synchronousLoadDecisionForIconURL(const String&, WebCore::DocumentLoader*) override;
+    virtual WebCore::Image* synchronousIconForPageURL(const String&, const WebCore::IntSize&) override;
     
     // Asynchronous calls we should use to replace the above when supported.
-    virtual bool supportsAsynchronousMode();
-    virtual void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>);
+    virtual bool supportsAsynchronousMode() override;
+    virtual void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>) override;
     void receivedIconLoadDecision(int decision, uint64_t callbackID);
-    virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>);
+    virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>) override;
 
 private:
-    // CoreIPC::MessageReceiver
-    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
+    // IPC::MessageReceiver
+    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
     
     // Callbacks from the UIProcess
     void urlImportFinished();
@@ -72,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