2 files changed, 38 insertions, 44 deletions

diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.cpp
index 7b8291df9..542eddd6d 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 <WebCore/SharedBuffer.h>
 #include <wtf/text/WTFString.h>
 
@@ -41,11 +42,10 @@ WebIconDatabaseProxy::~WebIconDatabaseProxy()
 {
 }
 
-WebIconDatabaseProxy::WebIconDatabaseProxy(WebProcess* process)
-    : m_isEnabled(false)
-    , m_process(process)
+WebIconDatabaseProxy::WebIconDatabaseProxy(WebProcess& process)
+    : m_process(process)
 {
-    m_process->addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), *this);
+    m_process.addMessageReceiver(Messages::WebIconDatabaseProxy::messageReceiverName(), *this);
 }
 
 bool WebIconDatabaseProxy::isEnabled() const
@@ -64,18 +64,18 @@ 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*/)
 {
     IPC::DataReference result;
-    if (!m_process->parentProcessConnection()->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.
@@ -109,34 +109,32 @@ bool WebIconDatabaseProxy::supportsAsynchronousMode()
     return true;
 }
 
-void WebIconDatabaseProxy::loadDecisionForIconURL(const String& iconURL, PassRefPtr<WebCore::IconLoadDecisionCallback> callback)
+void WebIconDatabaseProxy::loadDecisionForIconURL(const String& iconURL, WebCore::IconLoadDecisionCallback& callback)
 {
-    uint64_t id = callback->callbackID();
-    m_iconLoadDecisionCallbacks.add(id, callback);
-    
-    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0);
+    uint64_t id = callback.callbackID();
+    m_iconLoadDecisionCallbacks.add(id, &callback);
+    m_process.parentProcessConnection()->send(Messages::WebIconDatabase::GetLoadDecisionForIconURL(iconURL, id), 0);
 }
 
 void WebIconDatabaseProxy::receivedIconLoadDecision(int decision, uint64_t callbackID)
 {
-    RefPtr<WebCore::IconLoadDecisionCallback> callback = m_iconLoadDecisionCallbacks.take(callbackID);
-    if (callback)
+    if (auto callback = m_iconLoadDecisionCallbacks.take(callbackID))
         callback->performCallback(static_cast<WebCore::IconLoadDecision>(decision));
 }
 
-void WebIconDatabaseProxy::iconDataForIconURL(const String& /*iconURL*/, PassRefPtr<WebCore::IconDataCallback>)
+void WebIconDatabaseProxy::iconDataForIconURL(const String&, WebCore::IconDataCallback&)
 {
 }
 
 void WebIconDatabaseProxy::setIconURLForPageURL(const String& iconURL, const String& pageURL)
 {
-    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0);
+    m_process.parentProcessConnection()->send(Messages::WebIconDatabase::SetIconURLForPageURL(iconURL, pageURL), 0);
 }
 
-void WebIconDatabaseProxy::setIconDataForIconURL(PassRefPtr<SharedBuffer> iconData, const String& iconURL)
+void WebIconDatabaseProxy::setIconDataForIconURL(SharedBuffer* iconData, const String& iconURL)
 {
-    IPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : 0), iconData ? iconData->size() : 0);
-    m_process->parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0);
+    IPC::DataReference data(reinterpret_cast<const uint8_t*>(iconData ? iconData->data() : nullptr), iconData ? iconData->size() : 0);
+    m_process.parentProcessConnection()->send(Messages::WebIconDatabase::SetIconDataForIconURL(data, iconURL), 0);
 }
 
 void WebIconDatabaseProxy::urlImportFinished()
diff --git a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
index b5a13cd7b..bdf8d4cf6 100644
--- a/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
+++ b/Source/WebKit2/WebProcess/IconDatabase/WebIconDatabaseProxy.h
@@ -23,8 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebIconDatabaseProxy_h
-#define WebIconDatabaseProxy_h
+#pragma once
 
 #include "APIObject.h"
 #include "MessageReceiver.h"
@@ -32,49 +31,46 @@
 #include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
 
 namespace WebKit {
 
 class WebProcess;
 
-class WebIconDatabaseProxy : public WebCore::IconDatabaseBase, private IPC::MessageReceiver {
+class WebIconDatabaseProxy final : public WebCore::IconDatabaseBase, private IPC::MessageReceiver {
 public:
-    explicit WebIconDatabaseProxy(WebProcess*);
+    explicit WebIconDatabaseProxy(WebProcess&);
     virtual ~WebIconDatabaseProxy();
 
-    virtual bool isEnabled() const;
-    void setEnabled(bool);
+    void setEnabled(bool) final;
 
-    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&);
+private:
+    bool isEnabled() const final;
+
+    void retainIconForPageURL(const String&) final;
+    void releaseIconForPageURL(const String&) final;
+    void setIconURLForPageURL(const String&, const String&) final;
+    void setIconDataForIconURL(WebCore::SharedBuffer*, const String&) final;
 
-    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&);
+    String synchronousIconURLForPageURL(const String&) final;
+    bool synchronousIconDataKnownForIconURL(const String&) final;
+    WebCore::IconLoadDecision synchronousLoadDecisionForIconURL(const String&, WebCore::DocumentLoader*) final;
+    WebCore::Image* synchronousIconForPageURL(const String&, const WebCore::IntSize&) final;
     
-    // Asynchronous calls we should use to replace the above when supported.
-    virtual bool supportsAsynchronousMode();
-    virtual void loadDecisionForIconURL(const String&, PassRefPtr<WebCore::IconLoadDecisionCallback>);
+    bool supportsAsynchronousMode() final;
+    void loadDecisionForIconURL(const String&, WebCore::IconLoadDecisionCallback&) final;
     void receivedIconLoadDecision(int decision, uint64_t callbackID);
-    virtual void iconDataForIconURL(const String&, PassRefPtr<WebCore::IconDataCallback>);
+    void iconDataForIconURL(const String&, WebCore::IconDataCallback&) final;
 
-private:
     // IPC::MessageReceiver
-    void didReceiveMessage(IPC::Connection*, IPC::MessageDecoder&) override;
+    void didReceiveMessage(IPC::Connection&, IPC::Decoder&) final;
     
     // Callbacks from the UIProcess
     void urlImportFinished();
 
-    bool m_isEnabled;
-    WebProcess* m_process;
+    bool m_isEnabled { false };
+    WebProcess& m_process;
     
     HashMap<uint64_t, RefPtr<WebCore::IconLoadDecisionCallback>> m_iconLoadDecisionCallbacks;
 };
 
 } // namespace WebKit
-
-#endif // WebIconDatabaseProxy_h