diff options
Diffstat (limited to 'Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h')
-rw-r--r-- | Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h index 55cdb18a3..00b1f048a 100644 --- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h +++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h @@ -26,9 +26,10 @@ #ifndef WKBundlePageContextMenuClient_h #define WKBundlePageContextMenuClient_h -#include <WebKit2/WKBase.h> +#include <WebKit/WKBase.h> typedef void (*WKBundlePageGetContextMenuFromDefaultContextMenuCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKArrayRef defaultMenu, WKArrayRef* newMenu, WKTypeRef* userData, const void* clientInfo); +typedef void (*WKBundlePagePrepareForActionMenuCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKTypeRef* userData, const void* clientInfo); typedef struct WKBundlePageContextMenuClientBase { int version; @@ -38,17 +39,16 @@ typedef struct WKBundlePageContextMenuClientBase { typedef struct WKBundlePageContextMenuClientV0 { WKBundlePageContextMenuClientBase base; - // Version 0. WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu; } WKBundlePageContextMenuClientV0; -enum { kWKBundlePageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 }; -typedef struct WKBundlePageContextMenuClient { - int version; - const void * clientInfo; +typedef struct WKBundlePageContextMenuClientV1 { + WKBundlePageContextMenuClientBase base; - // Version 0. WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu; -} WKBundlePageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead"); + + // This is actually about immediate actions; we should consider deprecating and renaming. + WKBundlePagePrepareForActionMenuCallback prepareForActionMenu; +} WKBundlePageContextMenuClientV1; #endif // WKBundlePageContextMenuClient_h |