Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 8 insertions, 13 deletions

diff --git a/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h b/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h
index aba9577f2..214552570 100644
--- a/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h
+++ b/Source/WebKit2/UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.h
@@ -28,7 +28,7 @@
 
 #if ENABLE(CUSTOM_PROTOCOLS)
 
-#include "MessageID.h"
+#include "MessageReceiver.h"
 
 #if PLATFORM(MAC)
 #include <wtf/HashMap.h>
@@ -36,34 +36,29 @@
 OBJC_CLASS WKCustomProtocolLoader;
 #endif
 
-namespace CoreIPC {
-class Connection;
-class MessageDecoder;
-} // namespace CoreIPC
-
 namespace WebCore {
 class ResourceRequest;
 } // namespace WebCore
 
 namespace WebKit {
 
-class WebProcessProxy;
+class ChildProcessProxy;
 
-class CustomProtocolManagerProxy {
+class CustomProtocolManagerProxy : public CoreIPC::MessageReceiver {
 public:
-    explicit CustomProtocolManagerProxy(WebProcessProxy*);
+    explicit CustomProtocolManagerProxy(ChildProcessProxy*);
 
-    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
     void startLoading(uint64_t customProtocolID, const WebCore::ResourceRequest&);
     void stopLoading(uint64_t customProtocolID);
 
 private:
-    void didReceiveCustomProtocolManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
+    // CoreIPC::MessageReceiver
+    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&) OVERRIDE;
 
-    WebProcessProxy* m_webProcessProxy;
+    ChildProcessProxy* m_childProcessProxy;
 
 #if PLATFORM(MAC)
-    typedef HashMap<uint64_t, RetainPtr<WKCustomProtocolLoader> > LoaderMap;
+    typedef HashMap<uint64_t, RetainPtr<WKCustomProtocolLoader>> LoaderMap;
     LoaderMap m_loaderMap;
 #endif
 };