Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 17 insertions, 7 deletions

diff --git a/Source/WebKit2/UIProcess/WebContextClient.h b/Source/WebKit2/UIProcess/WebContextClient.h
index 698607c73..44d43cdfa 100644
--- a/Source/WebKit2/UIProcess/WebContextClient.h
+++ b/Source/WebKit2/UIProcess/WebContextClient.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,18 +27,28 @@
 #define WebContextClient_h
 
 #include "APIClient.h"
+#include "APIData.h"
 #include "WKContext.h"
 
+namespace API {
+class Array;
+
+template<> struct ClientTraits<WKContextClientBase> {
+    typedef std::tuple<WKContextClientV0, WKContextClientV1> Versions;
+};
+}
+
+
 namespace WebKit {
 
-class ImmutableArray;
-class WebContext;
+class WebProcessPool;
 
-class WebContextClient : public APIClient<WKContextClient, kWKContextClientCurrentVersion> {
+class WebContextClient : public API::Client<WKContextClientBase> {
 public:
-    void plugInAutoStartOriginHashesChanged(WebContext*);
-    void networkProcessDidCrash(WebContext*);
-    void plugInInformationBecameAvailable(WebContext*, ImmutableArray*);
+    void plugInAutoStartOriginHashesChanged(WebProcessPool*);
+    void networkProcessDidCrash(WebProcessPool*);
+    void plugInInformationBecameAvailable(WebProcessPool*, API::Array*);
+    PassRefPtr<API::Data> copyWebCryptoMasterKey(WebProcessPool*);
 };
 
 } // namespace WebKit