Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 9 insertions, 3 deletions

diff --git a/Source/WebKit2/UIProcess/WebContextConnectionClient.h b/Source/WebKit2/UIProcess/WebContextConnectionClient.h
index 148bd1bdb..23bddf0a6 100644
--- a/Source/WebKit2/UIProcess/WebContextConnectionClient.h
+++ b/Source/WebKit2/UIProcess/WebContextConnectionClient.h
@@ -29,14 +29,20 @@
 #include "APIClient.h"
 #include "WKContext.h"
 
+namespace API {
+template<> struct ClientTraits<WKContextConnectionClientBase> {
+    typedef std::tuple<WKContextConnectionClientV0> Versions;
+};
+}
+
 namespace WebKit {
 
 class WebConnection;
-class WebContext;
+class WebProcessPool;
 
-class WebContextConnectionClient : public APIClient<WKContextConnectionClient, kWKContextConnectionClientCurrentVersion> {
+class WebContextConnectionClient : public API::Client<WKContextConnectionClientBase> {
 public:
-    void didCreateConnection(WebContext*, WebConnection*);
+    void didCreateConnection(WebProcessPool*, WebConnection*);
 };
 
 } // namespace WebKit