webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 7 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
index e29656eb7..e07a6b2e6 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
@@ -26,8 +26,8 @@
 #ifndef WKBundlePageUIClient_h
 #define WKBundlePageUIClient_h
 
-#include <WebKit2/WKBase.h>
-#include <WebKit2/WKEvent.h>
+#include <WebKit/WKBase.h>
+#include <WebKit/WKEvent.h>
 
 enum {
     WKBundlePageUIElementVisibilityUnknown,
@@ -54,6 +54,7 @@ typedef WKStringRef (*WKBundlePagePlugInCreateStartLabelTitleCallback)(WKStringR
 typedef WKStringRef (*WKBundlePagePlugInCreateStartLabelSubtitleCallback)(WKStringRef mimeType, const void *clientInfo);
 typedef WKStringRef (*WKBundlePagePlugInCreateExtraStyleSheetCallback)(const void *clientInfo);
 typedef WKStringRef (*WKBundlePagePlugInCreateExtraScriptCallback)(const void *clientInfo);
+typedef void (*WKBundlePageDidClickAutoFillButtonCallback)(WKBundlePageRef page, WKBundleNodeHandleRef inputElement, WKTypeRef* userData, const void *clientInfo);
 
 typedef struct WKBundlePageUIClientBase {
     int                                                                 version;
@@ -133,10 +134,8 @@ typedef struct WKBundlePageUIClientV2 {
     WKBundlePagePlugInCreateExtraScriptCallback                         createPlugInExtraScript;
 } WKBundlePageUIClientV2;
 
-enum { kWKBundlePageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
-typedef struct WKBundlePageUIClient {
-    int                                                                 version;
-    const void *                                                        clientInfo;
+typedef struct WKBundlePageUIClientV3 {
+    WKBundlePageUIClientBase                                            base;
 
     // Version 0.
     WKBundlePageWillAddMessageToConsoleCallback                         willAddMessageToConsole;
@@ -163,6 +162,13 @@ typedef struct WKBundlePageUIClient {
     WKBundlePagePlugInCreateStartLabelSubtitleCallback                  createPlugInStartLabelSubtitle;
     WKBundlePagePlugInCreateExtraStyleSheetCallback                     createPlugInExtraStyleSheet;
     WKBundlePagePlugInCreateExtraScriptCallback                         createPlugInExtraScript;
-} WKBundlePageUIClient WK_DEPRECATED("Use an explicit versioned struct instead");
+
+    // Version 3.
+    void*                                                               unused3;
+    void*                                                               unused4;
+    void*                                                               unused5;
+
+    WKBundlePageDidClickAutoFillButtonCallback                          didClickAutoFillButton;
+} WKBundlePageUIClientV3;
 
 #endif // WKBundlePageUIClient_h