diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h')
-rw-r--r-- | Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h b/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h index e892c3d59..18d7b5b67 100644 --- a/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h +++ b/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h @@ -26,14 +26,15 @@ #ifndef WKPageContextMenuClient_h #define WKPageContextMenuClient_h -#include <WebKit2/WKBase.h> -#include <WebKit2/WKGeometry.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKGeometry.h> #ifdef __cplusplus extern "C" { #endif typedef void (*WKPageGetContextMenuFromProposedContextMenuCallback)(WKPageRef page, WKArrayRef proposedMenu, WKArrayRef* newMenu, WKHitTestResultRef hitTestResult, WKTypeRef userData, const void* clientInfo); +typedef void (*WKPageGetContextMenuFromProposedContextMenuCallbackAsync)(WKPageRef page, WKArrayRef proposedMenu, WKContextMenuListenerRef listener, WKHitTestResultRef hitTestResult, WKTypeRef userData, const void* clientInfo); typedef void (*WKPageCustomContextMenuItemSelectedCallback)(WKPageRef page, WKContextMenuItemRef contextMenuItem, const void* clientInfo); typedef void (*WKPageContextMenuDismissedCallback)(WKPageRef page, const void* clientInfo); typedef void (*WKPageShowContextMenuCallback)(WKPageRef page, WKPoint menuLocation, WKArrayRef menuItems, const void* clientInfo); @@ -98,10 +99,8 @@ typedef struct WKPageContextMenuClientV3 { WKPageHideContextMenuCallback hideContextMenu; } WKPageContextMenuClientV3; -enum { kWKPageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 }; -typedef struct WKPageContextMenuClient { - int version; - const void * clientInfo; +typedef struct WKPageContextMenuClientV4 { + WKPageContextMenuClientBase base; // Version 0. WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0 getContextMenuFromProposedMenu_deprecatedForUseWithV0; @@ -116,7 +115,11 @@ typedef struct WKPageContextMenuClient { // Version 3. WKPageShowContextMenuCallback showContextMenu; WKPageHideContextMenuCallback hideContextMenu; -} WKPageContextMenuClient WK_DEPRECATED("Use an explicit versioned struct instead"); + + // Version 4. + WKPageGetContextMenuFromProposedContextMenuCallbackAsync getContextMenuFromProposedMenuAsync; + +} WKPageContextMenuClientV4; #ifdef __cplusplus } |