1 files changed, 6 insertions, 12 deletions
diff --git a/Source/WebKit2/UIProcess/WebFormClient.h b/Source/WebKit2/UIProcess/WebFormClient.h
index 38e12ddd3..f2a6d67ea 100644
--- a/Source/WebKit2/UIProcess/WebFormClient.h
+++ b/Source/WebKit2/UIProcess/WebFormClient.h
@@ -27,14 +27,10 @@
 #define WebFormClient_h
 
 #include "APIClient.h"
-#include "WKPage.h"
-#include <utility>
-#include <wtf/Forward.h>
-#include <wtf/Vector.h>
+#include "APIFormClient.h"
+#include "WKPageFormClient.h"
 
 namespace API {
-class Object;
-
 template<> struct ClientTraits<WKPageFormClientBase> {
     typedef std::tuple<WKPageFormClientV0> Versions;
 };
@@ -42,13 +38,11 @@ template<> struct ClientTraits<WKPageFormClientBase> {
 
 namespace WebKit {
 
-class WebPageProxy;
-class WebFrameProxy;
-class WebFormSubmissionListenerProxy;
-
-class WebFormClient : public API::Client<WKPageFormClientBase> {
+class WebFormClient : public API::FormClient, API::Client<WKPageFormClientBase> {
 public:
-    bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String>>& textFieldValues, API::Object* userData, WebFormSubmissionListenerProxy*);
+    explicit WebFormClient(const WKPageFormClientBase*);
+
+    void willSubmitForm(WebPageProxy&, WebFrameProxy&, WebFrameProxy&, const Vector<std::pair<String, String>>& textFieldValues, API::Object* userData, Ref<WebFormSubmissionListenerProxy>&&) override;
 };
 
 } // namespace WebKit