webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 2 insertions, 23 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
index 5bd3ed428..3fc33b98d 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
@@ -26,7 +26,8 @@
 #ifndef WKBundlePageFormClient_h
 #define WKBundlePageFormClient_h
 
-#include <WebKit2/WKBase.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKBundlePageEditorClient.h>
 
 typedef void (*WKBundlePageTextFieldDidBeginEditingCallback)(WKBundlePageRef page, WKBundleNodeHandleRef htmlInputElementHandle, WKBundleFrameRef frame, const void* clientInfo);
 typedef void (*WKBundlePageTextFieldDidEndEditingCallback)(WKBundlePageRef page, WKBundleNodeHandleRef htmlInputElementHandle, WKBundleFrameRef frame, const void* clientInfo);
@@ -91,26 +92,4 @@ typedef struct WKBundlePageFormClientV2 {
     WKBundlePageDidAssociateFormControlsCallback                        didAssociateFormControls;
 } WKBundlePageFormClientV2;
 
-enum { kWKBundlePageFormClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
-typedef struct WKBundlePageFormClient {
-    int                                                                 version;
-    const void *                                                        clientInfo;
-    
-    // Version 0.
-    WKBundlePageTextFieldDidBeginEditingCallback                        textFieldDidBeginEditing;
-    WKBundlePageTextFieldDidEndEditingCallback                          textFieldDidEndEditing;
-    WKBundlePageTextDidChangeInTextFieldCallback                        textDidChangeInTextField;
-    WKBundlePageTextDidChangeInTextAreaCallback                         textDidChangeInTextArea;
-    WKBundlePageShouldPerformActionInTextFieldCallback                  shouldPerformActionInTextField;
-    WKBundlePageWillSubmitFormCallback                                  willSubmitForm;
-    
-    // Version 1.
-    WKBundlePageWillSendSubmitEventCallback                             willSendSubmitEvent;
-
-    // version 2.
-    WKBundlePageDidFocusTextFieldCallback                               didFocusTextField;
-    WKBundlePageShouldNotifyOnFormChangesCallback                       shouldNotifyOnFormChanges;
-    WKBundlePageDidAssociateFormControlsCallback                        didAssociateFormControls;
-} WKBundlePageFormClient WK_DEPRECATED("Use an explicit versioned struct instead");
-
 #endif // WKBundlePageFormClient_h