Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 9 insertions, 13 deletions

diff --git a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h
index b601283cf..44d107ea7 100644
--- a/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h
+++ b/Source/WebKit2/UIProcess/WebConnectionToWebProcess.h
@@ -26,33 +26,29 @@
 #ifndef WebConnectionToWebProcess_h
 #define WebConnectionToWebProcess_h
 
-#include "Connection.h"
 #include "WebConnection.h"
 
 namespace WebKit {
 
 class WebProcessProxy;
 
-class WebConnectionToWebProcess : public WebConnection, public CoreIPC::Connection::Client {
+class WebConnectionToWebProcess : public WebConnection {
 public:
-    static PassRefPtr<WebConnectionToWebProcess> create(WebProcessProxy*, CoreIPC::Connection::Identifier, WebCore::RunLoop*);
+    static PassRefPtr<WebConnectionToWebProcess> create(WebProcessProxy*);
 
     WebProcessProxy* webProcessProxy() const { return m_process; }
+
+    void invalidate();
+
 private:
-    WebConnectionToWebProcess(WebProcessProxy*, CoreIPC::Connection::Identifier, WebCore::RunLoop*);
+    WebConnectionToWebProcess(WebProcessProxy*);
 
     // WebConnection
     virtual void encodeMessageBody(CoreIPC::ArgumentEncoder&, APIObject*) OVERRIDE;
     virtual bool decodeMessageBody(CoreIPC::ArgumentDecoder&, RefPtr<APIObject>&) OVERRIDE;
-
-    // CoreIPC::Connection::Client
-    virtual void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
-    virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
-    virtual void didClose(CoreIPC::Connection*);
-    virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::StringReference messageReceiverName, CoreIPC::StringReference messageName);
-#if PLATFORM(WIN)
-    virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply();
-#endif
+    virtual CoreIPC::Connection* connection() const OVERRIDE;
+    virtual uint64_t destinationID() const OVERRIDE;
+    virtual bool hasValidConnection() const OVERRIDE;
 
     WebProcessProxy* m_process;
 };