Changeset 159981 in webkit
- Timestamp:
- Dec 2, 2013 4:40:33 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r159976 r159981 1 2013-12-02 Anders Carlsson <andersca@apple.com> 2 3 Add versioned structs for all clients except the ones in WKContext.h 4 https://bugs.webkit.org/show_bug.cgi?id=125120 5 6 Reviewed by Andreas Kling. 7 8 * Shared/API/c/WKConnectionRef.h: 9 * UIProcess/API/C/WKCookieManager.h: 10 * UIProcess/API/C/WKDatabaseManager.h: 11 * UIProcess/API/C/WKGeolocationManager.h: 12 * UIProcess/API/C/WKIconDatabase.h: 13 * UIProcess/API/C/WKNotificationProvider.h: 14 * UIProcess/API/C/WKPageContextMenuClient.h: 15 * UIProcess/API/C/WKPageFindClient.h: 16 * UIProcess/API/C/WKPageFindMatchesClient.h: 17 * UIProcess/API/C/WKPageFormClient.h: 18 * UIProcess/API/C/WKPageLoaderClient.h: 19 * UIProcess/API/C/WKPagePolicyClient.h: 20 * UIProcess/API/C/WKPageUIClient.h: 21 * WebProcess/InjectedBundle/API/c/WKBundle.h: 22 * WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h: 23 * WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h: 24 * WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h: 25 * WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h: 26 * WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h: 27 * WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h: 28 * WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h: 29 * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h: 30 * WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h: 31 * WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h: 32 * WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h: 33 1 34 2013-12-02 Anders Carlsson <andersca@apple.com> 2 35 -
trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h
r100336 r159981 36 36 typedef void (*WKConnectionDidCloseCallback)(WKConnectionRef connection, const void* clientInfo); 37 37 38 struct WKConnectionClient{38 typedef struct WKConnectionClientBase { 39 39 int version; 40 40 const void * clientInfo; 41 } WKConnectionClientBase; 42 43 typedef struct WKConnectionClientV0 { 44 WKConnectionClientBase base; 45 46 // Version 0. 41 47 WKConnectionDidReceiveMessageCallback didReceiveMessage; 42 48 WKConnectionDidCloseCallback didClose; 43 }; 44 typedef struct WKConnectionClient WKConnectionClient; 49 } WKConnectionClientV0; 45 50 51 // FIXME: Deprecate. 46 52 enum { WKConnectionClientCurrentVersion = 0 }; 53 typedef struct WKConnectionClient { 54 int version; 55 const void * clientInfo; 56 57 // Version 0. 58 WKConnectionDidReceiveMessageCallback didReceiveMessage; 59 WKConnectionDidCloseCallback didClose; 60 } WKConnectionClient; 47 61 48 62 WK_EXPORT WKTypeID WKConnectionGetTypeID(); -
trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h
r95901 r159981 43 43 typedef void (*WKCookieManagerCookiesDidChangeCallback)(WKCookieManagerRef cookieManager, const void *clientInfo); 44 44 45 struct WKCookieManagerClient{45 typedef struct WKCookieManagerClientBase { 46 46 int version; 47 47 const void * clientInfo; 48 } WKCookieManagerClientBase; 49 50 typedef struct WKCookieManagerClientV0 { 51 WKCookieManagerClientBase base; 52 53 // Version 0. 48 54 WKCookieManagerCookiesDidChangeCallback cookiesDidChange; 49 }; 50 typedef struct WKCookieManagerClient WKCookieManagerClient; 55 } WKCookieManagerClientV0; 51 56 57 // FIXME: Deprecate. 52 58 enum { kWKCookieManagerClientCurrentVersion = 0 }; 59 typedef struct WKCookieManagerClient { 60 int version; 61 const void * clientInfo; 62 63 // Version 0. 64 WKCookieManagerCookiesDidChangeCallback cookiesDidChange; 65 } WKCookieManagerClient; 53 66 54 67 WK_EXPORT WKTypeID WKCookieManagerGetTypeID(); -
trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h
r159059 r159981 67 67 typedef void (*WKDatabaseManagerDidModifyDatabaseCallback)(WKDatabaseManagerRef databaseManager, WKSecurityOriginRef origin, WKStringRef databaseIdentifier, const void *clientInfo); 68 68 69 struct WKDatabaseManagerClient{69 typedef struct WKDatabaseManagerClientBase { 70 70 int version; 71 71 const void * clientInfo; 72 } WKDatabaseManagerClientBase; 73 74 typedef struct WKDatabaseManagerClientV0 { 75 WKDatabaseManagerClientBase base; 76 77 // Version 0. 72 78 WKDatabaseManagerDidModifyOriginCallback didModifyOrigin; 73 79 WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase; 74 }; 75 typedef struct WKDatabaseManagerClient WKDatabaseManagerClient; 80 } WKDatabaseManagerClientV0; 76 81 82 // FIXME: Deprecate. 77 83 enum { kWKDatabaseManagerClientCurrentVersion = 0 }; 84 typedef struct WKDatabaseManagerClient { 85 int version; 86 const void * clientInfo; 78 87 88 // Version 0. 89 WKDatabaseManagerDidModifyOriginCallback didModifyOrigin; 90 WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase; 91 } WKDatabaseManagerClient; 79 92 80 93 WK_EXPORT WKTypeID WKDatabaseManagerGetTypeID(); -
trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h
r158689 r159981 38 38 typedef void (*WKGeolocationProviderSetEnableHighAccuracyCallback)(WKGeolocationManagerRef geolocationManager, bool enabled, const void* clientInfo); 39 39 40 struct WKGeolocationProvider { 40 typedef struct WKGeolocationProviderBase { 41 int version; 42 const void * clientInfo; 43 } WKGeolocationProviderBase; 44 45 typedef struct WKGeolocationProviderV0 { 46 WKGeolocationProviderBase base; 47 48 // Version 0. 49 WKGeolocationProviderStartUpdatingCallback startUpdating; 50 WKGeolocationProviderStopUpdatingCallback stopUpdating; 51 } WKGeolocationProviderV0; 52 53 typedef struct WKGeolocationProviderV1 { 54 WKGeolocationProviderBase base; 55 56 // Version 0. 57 WKGeolocationProviderStartUpdatingCallback startUpdating; 58 WKGeolocationProviderStopUpdatingCallback stopUpdating; 59 60 // Version 1. 61 WKGeolocationProviderSetEnableHighAccuracyCallback setEnableHighAccuracy; 62 } WKGeolocationProviderV1; 63 64 // FIXME: Deprecate. 65 enum { kWKGeolocationProviderCurrentVersion = 1 }; 66 typedef struct WKGeolocationProvider { 41 67 int version; 42 68 const void * clientInfo; … … 46 72 // Version 1. 47 73 WKGeolocationProviderSetEnableHighAccuracyCallback setEnableHighAccuracy; 74 } WKGeolocationProvider; 48 75 49 };50 typedef struct WKGeolocationProvider WKGeolocationProvider;51 52 enum { kWKGeolocationProviderCurrentVersion = 1 };53 76 54 77 WK_EXPORT WKTypeID WKGeolocationManagerGetTypeID(); -
trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h
r129789 r159981 38 38 typedef void (*WKIconDatabaseIconDataReadyForPageURLCallback)(WKIconDatabaseRef iconDatabase, WKURLRef pageURL, const void* clientInfo); 39 39 40 struct WKIconDatabaseClient { 40 typedef struct WKIconDatabaseClientBase { 41 int version; 42 const void * clientInfo; 43 } WKIconDatabaseClientBase; 44 45 typedef struct WKIconDatabaseClientV0 { 46 WKIconDatabaseClientBase base; 47 48 // Version 0. 49 WKIconDatabaseDidChangeIconForPageURLCallback didChangeIconForPageURL; 50 WKIconDatabaseDidRemoveAllIconsCallback didRemoveAllIcons; 51 } WKIconDatabaseClientV0; 52 53 typedef struct WKIconDatabaseClientV1 { 54 WKIconDatabaseClientBase base; 55 56 // Version 0. 57 WKIconDatabaseDidChangeIconForPageURLCallback didChangeIconForPageURL; 58 WKIconDatabaseDidRemoveAllIconsCallback didRemoveAllIcons; 59 60 // Version 1. 61 WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL; 62 } WKIconDatabaseClientV1; 63 64 // FIXME: Deprecate. 65 enum { kWKIconDatabaseClientCurrentVersion = 1 }; 66 typedef struct WKIconDatabaseClient { 41 67 int version; 42 68 const void * clientInfo; 43 69 44 // Version 0 70 // Version 0. 45 71 WKIconDatabaseDidChangeIconForPageURLCallback didChangeIconForPageURL; 46 72 WKIconDatabaseDidRemoveAllIconsCallback didRemoveAllIcons; 47 73 48 // Version 1 74 // Version 1. 49 75 WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL; 50 }; 51 typedef struct WKIconDatabaseClient WKIconDatabaseClient; 52 53 enum { kWKIconDatabaseClientCurrentVersion = 1 }; 76 } WKIconDatabaseClient; 54 77 55 78 WK_EXPORT WKTypeID WKIconDatabaseGetTypeID(); -
trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h
r106592 r159981 41 41 typedef void (*WKNotificationProviderClearNotificationsCallback)(WKArrayRef notificationIDs, const void* clientInfo); 42 42 43 struct WKNotificationProvider{43 typedef struct WKNotificationProviderBase { 44 44 int version; 45 45 const void* clientInfo; 46 } WKNotificationProviderBase; 47 48 typedef struct WKNotificationProviderV0 { 49 WKNotificationProviderBase base; 50 51 // Version 0. 46 52 WKNotificationProviderShowCallback show; 47 53 WKNotificationProviderCancelCallback cancel; … … 51 57 WKNotificationProviderNotificationPermissionsCallback notificationPermissions; 52 58 WKNotificationProviderClearNotificationsCallback clearNotifications; 53 }; 54 typedef struct WKNotificationProvider WKNotificationProvider; 59 } WKNotificationProviderV0; 55 60 61 // FIXME: Deprecate. 56 62 enum { kWKNotificationProviderCurrentVersion = 0 }; 63 typedef struct WKNotificationProvider { 64 int version; 65 const void* clientInfo; 66 67 // Version 0. 68 WKNotificationProviderShowCallback show; 69 WKNotificationProviderCancelCallback cancel; 70 WKNotificationProviderDidDestroyNotificationCallback didDestroyNotification; 71 WKNotificationProviderAddNotificationManagerCallback addNotificationManager; 72 WKNotificationProviderRemoveNotificationManagerCallback removeNotificationManager; 73 WKNotificationProviderNotificationPermissionsCallback notificationPermissions; 74 WKNotificationProviderClearNotificationsCallback clearNotifications; 75 } WKNotificationProvider; 57 76 58 77 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h
r159788 r159981 34 34 #endif 35 35 36 // ContextMenu client37 36 typedef void (*WKPageGetContextMenuFromProposedContextMenuCallback)(WKPageRef page, WKArrayRef proposedMenu, WKArrayRef* newMenu, WKHitTestResultRef hitTestResult, WKTypeRef userData, const void* clientInfo); 38 37 typedef void (*WKPageCustomContextMenuItemSelectedCallback)(WKPageRef page, WKContextMenuItemRef contextMenuItem, const void* clientInfo); … … 43 42 // Deprecated 44 43 typedef void (*WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0)(WKPageRef page, WKArrayRef proposedMenu, WKArrayRef* newMenu, WKTypeRef userData, const void* clientInfo); 45 struct WKPageContextMenuClient { 44 45 typedef struct WKPageContextMenuClientBase { 46 int version; 47 const void * clientInfo; 48 } WKPageContextMenuClientBase; 49 50 typedef struct WKPageContextMenuClientV0 { 51 WKPageContextMenuClientBase base; 52 53 // Version 0. 54 WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0 getContextMenuFromProposedMenu_deprecatedForUseWithV0; 55 WKPageCustomContextMenuItemSelectedCallback customContextMenuItemSelected; 56 } WKPageContextMenuClientV0; 57 58 typedef struct WKPageContextMenuClientV1 { 59 WKPageContextMenuClientBase base; 60 61 // Version 0. 62 WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0 getContextMenuFromProposedMenu_deprecatedForUseWithV0; 63 WKPageCustomContextMenuItemSelectedCallback customContextMenuItemSelected; 64 65 // Version 1. 66 WKPageContextMenuDismissedCallback contextMenuDismissed; 67 } WKPageContextMenuClientV1; 68 69 typedef struct WKPageContextMenuClientV2 { 70 WKPageContextMenuClientBase base; 71 72 // Version 0. 73 WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0 getContextMenuFromProposedMenu_deprecatedForUseWithV0; 74 WKPageCustomContextMenuItemSelectedCallback customContextMenuItemSelected; 75 76 // Version 1. 77 WKPageContextMenuDismissedCallback contextMenuDismissed; 78 79 // Version 2. 80 WKPageGetContextMenuFromProposedContextMenuCallback getContextMenuFromProposedMenu; 81 } WKPageContextMenuClientV2; 82 83 typedef struct WKPageContextMenuClientV3 { 84 WKPageContextMenuClientBase base; 85 86 // Version 0. 87 WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0 getContextMenuFromProposedMenu_deprecatedForUseWithV0; 88 WKPageCustomContextMenuItemSelectedCallback customContextMenuItemSelected; 89 90 // Version 1. 91 WKPageContextMenuDismissedCallback contextMenuDismissed; 92 93 // Version 2. 94 WKPageGetContextMenuFromProposedContextMenuCallback getContextMenuFromProposedMenu; 95 96 // Version 3. 97 WKPageShowContextMenuCallback showContextMenu; 98 WKPageHideContextMenuCallback hideContextMenu; 99 } WKPageContextMenuClientV3; 100 101 // FIXME: Deprecate. 102 enum { kWKPageContextMenuClientCurrentVersion = 3 }; 103 typedef struct WKPageContextMenuClient { 46 104 int version; 47 105 const void * clientInfo; 48 106 49 // Version 0 107 // Version 0. 50 108 WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0 getContextMenuFromProposedMenu_deprecatedForUseWithV0; 51 109 WKPageCustomContextMenuItemSelectedCallback customContextMenuItemSelected; 52 110 53 // Version 1 111 // Version 1. 54 112 WKPageContextMenuDismissedCallback contextMenuDismissed; 55 113 56 // Version 2 114 // Version 2. 57 115 WKPageGetContextMenuFromProposedContextMenuCallback getContextMenuFromProposedMenu; 58 116 59 // Version 3 117 // Version 3. 60 118 WKPageShowContextMenuCallback showContextMenu; 61 119 WKPageHideContextMenuCallback hideContextMenu; 62 }; 63 typedef struct WKPageContextMenuClient WKPageContextMenuClient; 64 65 enum { kWKPageContextMenuClientCurrentVersion = 3 }; 120 } WKPageContextMenuClient; 66 121 67 122 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h
r159715 r159981 33 33 #endif 34 34 35 // Find client.36 35 typedef void (*WKPageDidFindStringCallback)(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo); 37 36 typedef void (*WKPageDidFailToFindStringCallback)(WKPageRef page, WKStringRef string, const void* clientInfo); 38 37 typedef void (*WKPageDidCountStringMatchesCallback)(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo); 39 38 40 struct WKPageFindClient{39 typedef struct WKPageFindClientBase { 41 40 int version; 42 41 const void * clientInfo; 42 } WKPageFindClientBase; 43 44 typedef struct WKPageFindClientV0 { 45 WKPageFindClientBase base; 46 47 // Version 0. 43 48 WKPageDidFindStringCallback didFindString; 44 49 WKPageDidFailToFindStringCallback didFailToFindString; 45 50 WKPageDidCountStringMatchesCallback didCountStringMatches; 46 }; 47 typedef struct WKPageFindClient WKPageFindClient; 51 } WKPageFindClientV0; 48 52 53 // FIXME: Deprecate. 49 54 enum { kWKPageFindClientCurrentVersion = 0 }; 55 typedef struct WKPageFindClient { 56 int version; 57 const void * clientInfo; 58 59 // Version 0. 60 WKPageDidFindStringCallback didFindString; 61 WKPageDidFailToFindStringCallback didFailToFindString; 62 WKPageDidCountStringMatchesCallback didCountStringMatches; 63 } WKPageFindClient; 50 64 51 65 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h
r159715 r159981 41 41 typedef void (*WKPageDidGetImageForMatchResultCallback)(WKPageRef page, WKImageRef image, uint32_t index, const void* clientInfo); 42 42 43 struct WKPageFindMatchesClient { 43 typedef struct WKPageFindMatchesClientBase { 44 int version; 45 const void * clientInfo; 46 } WKPageFindMatchesClientBase; 47 48 typedef struct WKPageFindMatchesClientV0 { 49 WKPageFindMatchesClientBase base; 50 51 // Version 0. 52 WKPageDidFindStringMatchesCallback didFindStringMatches; 53 WKPageDidGetImageForMatchResultCallback didGetImageForMatchResult; 54 } WKPageFindMatchesClientV0; 55 56 // FIXME: Deprecate. 57 enum { kWKPageFindMatchesClientCurrentVersion = 0 }; 58 typedef struct WKPageFindMatchesClient { 44 59 int version; 45 60 const void * clientInfo; 46 61 WKPageDidFindStringMatchesCallback didFindStringMatches; 47 62 WKPageDidGetImageForMatchResultCallback didGetImageForMatchResult; 48 }; 49 typedef struct WKPageFindMatchesClient WKPageFindMatchesClient; 50 51 enum { kWKPageFindMatchesClientCurrentVersion = 0 }; 63 } WKPageFindMatchesClient; 52 64 53 65 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h
r159715 r159981 36 36 typedef void (*WKPageWillSubmitFormCallback)(WKPageRef page, WKFrameRef frame, WKFrameRef sourceFrame, WKDictionaryRef values, WKTypeRef userData, WKFormSubmissionListenerRef listener, const void* clientInfo); 37 37 38 struct WKPageFormClient{38 typedef struct WKPageFormClientBase { 39 39 int version; 40 40 const void * clientInfo; 41 } WKPageFormClientBase; 42 43 typedef struct WKPageFormClientV0 { 44 WKPageFormClientBase base; 45 46 // Version 0. 41 47 WKPageWillSubmitFormCallback willSubmitForm; 42 }; 43 typedef struct WKPageFormClient WKPageFormClient; 48 } WKPageFormClientV0; 44 49 50 // FIXME: Deprecate. 45 51 enum { kWKPageFormClientCurrentVersion = 0 }; 52 typedef struct WKPageFormClient { 53 int version; 54 const void * clientInfo; 55 56 // Version 0. 57 WKPageWillSubmitFormCallback willSubmitForm; 58 } WKPageFormClient; 46 59 47 60 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h
r159965 r159981 80 80 typedef struct WKPageLoaderClientV0 { 81 81 WKPageLoaderClientBase base; 82 83 // Version 0. 82 84 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 83 85 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; … … 113 115 typedef struct WKPageLoaderClientV1 { 114 116 WKPageLoaderClientBase base; 115 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 116 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 117 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 118 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 119 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 120 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 121 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 122 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 123 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 124 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 125 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 126 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 127 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 128 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 129 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 130 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 131 132 // FIXME: Move to progress client. 133 WKPageLoaderClientCallback didStartProgress; 134 WKPageLoaderClientCallback didChangeProgress; 135 WKPageLoaderClientCallback didFinishProgress; 136 137 // FIXME: These three functions should not be part of this client. 138 WKPageLoaderClientCallback processDidBecomeUnresponsive; 139 WKPageLoaderClientCallback processDidBecomeResponsive; 140 WKPageLoaderClientCallback processDidCrash; 141 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 142 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 143 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 144 145 // Version 1 117 118 // Version -. 119 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 120 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 121 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 122 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 123 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 124 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 125 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 126 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 127 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 128 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 129 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 130 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 131 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 132 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 133 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 134 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 135 136 // FIXME: Move to progress client. 137 WKPageLoaderClientCallback didStartProgress; 138 WKPageLoaderClientCallback didChangeProgress; 139 WKPageLoaderClientCallback didFinishProgress; 140 141 // FIXME: These three functions should not be part of this client. 142 WKPageLoaderClientCallback processDidBecomeUnresponsive; 143 WKPageLoaderClientCallback processDidBecomeResponsive; 144 WKPageLoaderClientCallback processDidCrash; 145 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 146 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 147 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 148 149 // Version 1. 146 150 WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame; 147 151 … … 156 160 typedef struct WKPageLoaderClientV2 { 157 161 WKPageLoaderClientBase base; 158 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 159 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 160 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 161 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 162 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 163 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 164 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 165 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 166 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 167 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 168 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 169 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 170 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 171 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 172 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 173 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 174 175 // FIXME: Move to progress client. 176 WKPageLoaderClientCallback didStartProgress; 177 WKPageLoaderClientCallback didChangeProgress; 178 WKPageLoaderClientCallback didFinishProgress; 179 180 // FIXME: These three functions should not be part of this client. 181 WKPageLoaderClientCallback processDidBecomeUnresponsive; 182 WKPageLoaderClientCallback processDidBecomeResponsive; 183 WKPageLoaderClientCallback processDidCrash; 184 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 185 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 186 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 187 188 // Version 1 162 163 // Version 0. 164 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 165 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 166 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 167 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 168 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 169 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 170 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 171 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 172 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 173 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 174 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 175 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 176 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 177 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 178 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 179 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 180 181 // FIXME: Move to progress client. 182 WKPageLoaderClientCallback didStartProgress; 183 WKPageLoaderClientCallback didChangeProgress; 184 WKPageLoaderClientCallback didFinishProgress; 185 186 // FIXME: These three functions should not be part of this client. 187 WKPageLoaderClientCallback processDidBecomeUnresponsive; 188 WKPageLoaderClientCallback processDidBecomeResponsive; 189 WKPageLoaderClientCallback processDidCrash; 190 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 191 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 192 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 193 194 // Version 1. 189 195 WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame; 190 196 … … 196 202 WKPagePluginDidFailCallback_deprecatedForUseWithV1 pluginDidFail_deprecatedForUseWithV1; 197 203 198 // Version 2 204 // Version 2. 199 205 void (*didReceiveIntentForFrame_unavailable)(void); 200 206 void (*registerIntentServiceForFrame_unavailable)(void); … … 207 213 typedef struct WKPageLoaderClientV3 { 208 214 WKPageLoaderClientBase base; 209 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 210 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 211 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 212 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 213 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 214 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 215 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 216 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 217 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 218 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 219 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 220 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 221 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 222 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 223 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 224 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 225 226 // FIXME: Move to progress client. 227 WKPageLoaderClientCallback didStartProgress; 228 WKPageLoaderClientCallback didChangeProgress; 229 WKPageLoaderClientCallback didFinishProgress; 230 231 // FIXME: These three functions should not be part of this client. 232 WKPageLoaderClientCallback processDidBecomeUnresponsive; 233 WKPageLoaderClientCallback processDidBecomeResponsive; 234 WKPageLoaderClientCallback processDidCrash; 235 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 236 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 237 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 238 239 // Version 1 215 216 // Version 0. 217 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 218 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 219 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 220 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 221 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 222 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 223 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 224 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 225 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 226 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 227 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 228 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 229 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 230 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 231 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 232 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 233 234 // FIXME: Move to progress client. 235 WKPageLoaderClientCallback didStartProgress; 236 WKPageLoaderClientCallback didChangeProgress; 237 WKPageLoaderClientCallback didFinishProgress; 238 239 // FIXME: These three functions should not be part of this client. 240 WKPageLoaderClientCallback processDidBecomeUnresponsive; 241 WKPageLoaderClientCallback processDidBecomeResponsive; 242 WKPageLoaderClientCallback processDidCrash; 243 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 244 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 245 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 246 247 // Version 1. 240 248 WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame; 241 249 … … 247 255 WKPagePluginDidFailCallback_deprecatedForUseWithV1 pluginDidFail_deprecatedForUseWithV1; 248 256 249 // Version 2 257 // Version 2. 250 258 void (*didReceiveIntentForFrame_unavailable)(void); 251 259 void (*registerIntentServiceForFrame_unavailable)(void); … … 255 263 WKPagePluginDidFailCallback pluginDidFail; 256 264 257 // Version 3 265 // Version 3. 258 266 WKPagePluginLoadPolicyCallback pluginLoadPolicy; 259 267 } WKPageLoaderClientV3; … … 264 272 int version; 265 273 const void * clientInfo; 266 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 267 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 268 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 269 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 270 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 271 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 272 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 273 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 274 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 275 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 276 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 277 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 278 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 279 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 280 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 281 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 282 283 // FIXME: Move to progress client. 284 WKPageLoaderClientCallback didStartProgress; 285 WKPageLoaderClientCallback didChangeProgress; 286 WKPageLoaderClientCallback didFinishProgress; 287 288 // FIXME: These three functions should not be part of this client. 289 WKPageLoaderClientCallback processDidBecomeUnresponsive; 290 WKPageLoaderClientCallback processDidBecomeResponsive; 291 WKPageLoaderClientCallback processDidCrash; 292 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 293 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 294 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 295 296 // Version 1 274 275 // Version 0. 276 WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 277 WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 278 WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 279 WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame; 280 WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 281 WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame; 282 WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 283 WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 284 WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 285 WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 286 WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 287 WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 288 WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 289 WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 290 WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame; 291 WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame; 292 293 // FIXME: Move to progress client. 294 WKPageLoaderClientCallback didStartProgress; 295 WKPageLoaderClientCallback didChangeProgress; 296 WKPageLoaderClientCallback didFinishProgress; 297 298 // FIXME: These three functions should not be part of this client. 299 WKPageLoaderClientCallback processDidBecomeUnresponsive; 300 WKPageLoaderClientCallback processDidBecomeResponsive; 301 WKPageLoaderClientCallback processDidCrash; 302 WKPageDidChangeBackForwardListCallback didChangeBackForwardList; 303 WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 304 WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0; 305 306 // Version 1. 297 307 WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame; 298 308 … … 304 314 WKPagePluginDidFailCallback_deprecatedForUseWithV1 pluginDidFail_deprecatedForUseWithV1; 305 315 306 // Version 2 316 // Version 2. 307 317 void (*didReceiveIntentForFrame_unavailable)(void); 308 318 void (*registerIntentServiceForFrame_unavailable)(void); … … 312 322 WKPagePluginDidFailCallback pluginDidFail; 313 323 314 // Version 3 324 // Version 3. 315 325 WKPagePluginLoadPolicyCallback pluginLoadPolicy; 316 326 } WKPageLoaderClient; -
trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h
r159788 r159981 35 35 #endif 36 36 37 // Policy Client.38 37 typedef void (*WKPageDecidePolicyForNavigationActionCallback)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKFrameRef originatingFrame, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo); 39 38 typedef void (*WKPageDecidePolicyForNewWindowActionCallback)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo); … … 41 40 typedef void (*WKPageUnableToImplementPolicyCallback)(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo); 42 41 43 // Deprecated44 42 typedef void (*WKPageDecidePolicyForNavigationActionCallback_deprecatedForUseWithV0)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo); 45 43 typedef void (*WKPageDecidePolicyForResponseCallback)(WKPageRef page, WKFrameRef frame, WKURLResponseRef response, WKURLRequestRef request, bool canShowMIMEType, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo); 46 44 47 struct WKPagePolicyClient{45 typedef struct WKPagePolicyClientBase { 48 46 int version; 49 47 const void * clientInfo; 48 } WKPagePolicyClientBase; 49 50 typedef struct WKPagePolicyClientV0 { 51 WKPagePolicyClientBase base; 52 53 // Version 0. 54 WKPageDecidePolicyForNavigationActionCallback_deprecatedForUseWithV0 decidePolicyForNavigationAction_deprecatedForUseWithV0; 55 WKPageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction; 56 WKPageDecidePolicyForResponseCallback_deprecatedForUseWithV0 decidePolicyForResponse_deprecatedForUseWithV0; 57 WKPageUnableToImplementPolicyCallback unableToImplementPolicy; 58 } WKPagePolicyClientV0; 59 60 typedef struct WKPagePolicyClientV1 { 61 WKPagePolicyClientBase base; 62 63 // Version 0. 50 64 WKPageDecidePolicyForNavigationActionCallback_deprecatedForUseWithV0 decidePolicyForNavigationAction_deprecatedForUseWithV0; 51 65 WKPageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction; … … 53 67 WKPageUnableToImplementPolicyCallback unableToImplementPolicy; 54 68 55 // Version 1 69 // Version 1. 56 70 WKPageDecidePolicyForNavigationActionCallback decidePolicyForNavigationAction; 57 71 WKPageDecidePolicyForResponseCallback decidePolicyForResponse; 58 }; 59 typedef struct WKPagePolicyClient WKPagePolicyClient; 72 } WKPagePolicyClientV1; 60 73 74 // FIXME: These should be deprecated. 61 75 enum { kWKPagePolicyClientCurrentVersion = 1 }; 76 typedef struct WKPagePolicyClient { 77 int version; 78 const void * clientInfo; 79 80 // Version 0. 81 WKPageDecidePolicyForNavigationActionCallback_deprecatedForUseWithV0 decidePolicyForNavigationAction_deprecatedForUseWithV0; 82 WKPageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction; 83 WKPageDecidePolicyForResponseCallback_deprecatedForUseWithV0 decidePolicyForResponse_deprecatedForUseWithV0; 84 WKPageUnableToImplementPolicyCallback unableToImplementPolicy; 85 86 // Version 1. 87 WKPageDecidePolicyForNavigationActionCallback decidePolicyForNavigationAction; 88 WKPageDecidePolicyForResponseCallback decidePolicyForResponse; 89 } WKPagePolicyClient; 62 90 63 91 #ifdef __cplusplus -
trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h
r159788 r159981 93 93 typedef void (*WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1)(WKPageRef page, WKPluginUnavailabilityReason pluginUnavailabilityReason, WKStringRef mimeType, WKStringRef url, WKStringRef pluginsPageURL, const void* clientInfo); 94 94 95 struct WKPageUIClient{95 typedef struct WKPageUIClientBase { 96 96 int version; 97 97 const void * clientInfo; 98 99 // Version 0 98 } WKPageUIClientBase; 99 100 typedef struct WKPageUIClientV0 { 101 WKPageUIClientBase base; 102 103 // Version 0. 100 104 WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0; 101 105 WKPageUIClientCallback showPage; … … 137 141 WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder; 138 142 WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript; 139 140 // Version 1 143 } WKPageUIClientV0; 144 145 typedef struct WKPageUIClientV1 { 146 WKPageUIClientBase base; 147 148 // Version 0. 149 WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0; 150 WKPageUIClientCallback showPage; 151 WKPageUIClientCallback close; 152 WKPageTakeFocusCallback takeFocus; 153 WKPageFocusCallback focus; 154 WKPageUnfocusCallback unfocus; 155 WKPageRunJavaScriptAlertCallback runJavaScriptAlert; 156 WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm; 157 WKPageRunJavaScriptPromptCallback runJavaScriptPrompt; 158 WKPageSetStatusTextCallback setStatusText; 159 WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0; 160 WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0; 161 WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent; 162 WKPageDidNotHandleWheelEventCallback didNotHandleWheelEvent; 163 WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible; 164 WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible; 165 WKPageGetMenuBarIsVisibleCallback menuBarIsVisible; 166 WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible; 167 WKPageGetStatusBarIsVisibleCallback statusBarIsVisible; 168 WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible; 169 WKPageGetIsResizableCallback isResizable; 170 WKPageSetIsResizableCallback setIsResizable; 171 WKPageGetWindowFrameCallback getWindowFrame; 172 WKPageSetWindowFrameCallback setWindowFrame; 173 WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel; 174 WKPageUIClientCallback didDraw; 175 WKPageUIClientCallback pageDidScroll; 176 WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota; 177 WKPageRunOpenPanelCallback runOpenPanel; 178 WKPageDecidePolicyForGeolocationPermissionRequestCallback decidePolicyForGeolocationPermissionRequest; 179 WKPageHeaderHeightCallback headerHeight; 180 WKPageFooterHeightCallback footerHeight; 181 WKPageDrawHeaderCallback drawHeader; 182 WKPageDrawFooterCallback drawFooter; 183 WKPagePrintFrameCallback printFrame; 184 WKPageUIClientCallback runModal; 185 void* unused1; // Used to be didCompleteRubberBandForMainFrame 186 WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder; 187 WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript; 188 189 // Version 1. 141 190 WKPageCreateNewPageCallback createNewPage; 142 191 WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 143 192 WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest; 144 193 WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1; 145 146 // Version 2 194 } WKPageUIClientV1; 195 196 typedef struct WKPageUIClientV2 { 197 WKPageUIClientBase base; 198 199 // Version 0. 200 WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0; 201 WKPageUIClientCallback showPage; 202 WKPageUIClientCallback close; 203 WKPageTakeFocusCallback takeFocus; 204 WKPageFocusCallback focus; 205 WKPageUnfocusCallback unfocus; 206 WKPageRunJavaScriptAlertCallback runJavaScriptAlert; 207 WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm; 208 WKPageRunJavaScriptPromptCallback runJavaScriptPrompt; 209 WKPageSetStatusTextCallback setStatusText; 210 WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0; 211 WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0; 212 WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent; 213 WKPageDidNotHandleWheelEventCallback didNotHandleWheelEvent; 214 WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible; 215 WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible; 216 WKPageGetMenuBarIsVisibleCallback menuBarIsVisible; 217 WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible; 218 WKPageGetStatusBarIsVisibleCallback statusBarIsVisible; 219 WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible; 220 WKPageGetIsResizableCallback isResizable; 221 WKPageSetIsResizableCallback setIsResizable; 222 WKPageGetWindowFrameCallback getWindowFrame; 223 WKPageSetWindowFrameCallback setWindowFrame; 224 WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel; 225 WKPageUIClientCallback didDraw; 226 WKPageUIClientCallback pageDidScroll; 227 WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota; 228 WKPageRunOpenPanelCallback runOpenPanel; 229 WKPageDecidePolicyForGeolocationPermissionRequestCallback decidePolicyForGeolocationPermissionRequest; 230 WKPageHeaderHeightCallback headerHeight; 231 WKPageFooterHeightCallback footerHeight; 232 WKPageDrawHeaderCallback drawHeader; 233 WKPageDrawFooterCallback drawFooter; 234 WKPagePrintFrameCallback printFrame; 235 WKPageUIClientCallback runModal; 236 void* unused1; // Used to be didCompleteRubberBandForMainFrame 237 WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder; 238 WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript; 239 240 // Version 1. 241 WKPageCreateNewPageCallback createNewPage; 242 WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 243 WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest; 244 WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1; 245 246 // Version 2. 147 247 WKPageShowColorPickerCallback showColorPicker; 148 248 WKPageHideColorPickerCallback hideColorPicker; 149 249 WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked; 150 } ;151 typedef struct WKPageUIClient WKPageUIClient; 152 250 } WKPageUIClientV2; 251 252 // FIXME: Deprecate. 153 253 enum { kWKPageUIClientCurrentVersion = 2 }; 254 typedef struct WKPageUIClient { 255 int version; 256 const void * clientInfo; 257 258 // Version 0. 259 WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0; 260 WKPageUIClientCallback showPage; 261 WKPageUIClientCallback close; 262 WKPageTakeFocusCallback takeFocus; 263 WKPageFocusCallback focus; 264 WKPageUnfocusCallback unfocus; 265 WKPageRunJavaScriptAlertCallback runJavaScriptAlert; 266 WKPageRunJavaScriptConfirmCallback runJavaScriptConfirm; 267 WKPageRunJavaScriptPromptCallback runJavaScriptPrompt; 268 WKPageSetStatusTextCallback setStatusText; 269 WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0; 270 WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0; 271 WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent; 272 WKPageDidNotHandleWheelEventCallback didNotHandleWheelEvent; 273 WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible; 274 WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible; 275 WKPageGetMenuBarIsVisibleCallback menuBarIsVisible; 276 WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible; 277 WKPageGetStatusBarIsVisibleCallback statusBarIsVisible; 278 WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible; 279 WKPageGetIsResizableCallback isResizable; 280 WKPageSetIsResizableCallback setIsResizable; 281 WKPageGetWindowFrameCallback getWindowFrame; 282 WKPageSetWindowFrameCallback setWindowFrame; 283 WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel; 284 WKPageUIClientCallback didDraw; 285 WKPageUIClientCallback pageDidScroll; 286 WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota; 287 WKPageRunOpenPanelCallback runOpenPanel; 288 WKPageDecidePolicyForGeolocationPermissionRequestCallback decidePolicyForGeolocationPermissionRequest; 289 WKPageHeaderHeightCallback headerHeight; 290 WKPageFooterHeightCallback footerHeight; 291 WKPageDrawHeaderCallback drawHeader; 292 WKPageDrawFooterCallback drawFooter; 293 WKPagePrintFrameCallback printFrame; 294 WKPageUIClientCallback runModal; 295 void* unused1; // Used to be didCompleteRubberBandForMainFrame 296 WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder; 297 WKPageShouldInterruptJavaScriptCallback shouldInterruptJavaScript; 298 299 // Version 1. 300 WKPageCreateNewPageCallback createNewPage; 301 WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 302 WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest; 303 WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1; 304 305 // Version 2. 306 WKPageShowColorPickerCallback showColorPicker; 307 WKPageHideColorPickerCallback hideColorPicker; 308 WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked; 309 } WKPageUIClient; 154 310 155 311 #ifdef __cplusplus -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h
r126311 r159981 41 41 typedef void (*WKBundleDidReceiveMessageToPageCallback)(WKBundleRef bundle, WKBundlePageRef page, WKStringRef name, WKTypeRef messageBody, const void* clientInfo); 42 42 43 struct WKBundleClient{43 typedef struct WKBundleClientBase { 44 44 int version; 45 45 const void * clientInfo; 46 } WKBundleClientBase; 47 48 typedef struct WKBundleClientV0 { 49 WKBundleClientBase base; 50 51 // Version 0. 52 WKBundleDidCreatePageCallback didCreatePage; 53 WKBundleWillDestroyPageCallback willDestroyPage; 54 WKBundleDidInitializePageGroupCallback didInitializePageGroup; 55 WKBundleDidReceiveMessageCallback didReceiveMessage; 56 } WKBundleClientV0; 57 58 typedef struct WKBundleClientV1 { 59 WKBundleClientBase base; 60 61 // Version 0. 46 62 WKBundleDidCreatePageCallback didCreatePage; 47 63 WKBundleWillDestroyPageCallback willDestroyPage; … … 51 67 // Version 1. 52 68 WKBundleDidReceiveMessageToPageCallback didReceiveMessageToPage; 53 }; 54 typedef struct WKBundleClient WKBundleClient; 69 } WKBundleClientV1; 55 70 71 // FIXME: Deprecate. 56 72 enum { kWKBundleClientCurrentVersion = 1 }; 73 typedef struct WKBundleClient { 74 int version; 75 const void * clientInfo; 76 77 // Version 0. 78 WKBundleDidCreatePageCallback didCreatePage; 79 WKBundleWillDestroyPageCallback willDestroyPage; 80 WKBundleDidInitializePageGroupCallback didInitializePageGroup; 81 WKBundleDidReceiveMessageCallback didReceiveMessage; 82 83 // Version 1. 84 WKBundleDidReceiveMessageToPageCallback didReceiveMessageToPage; 85 } WKBundleClient; 57 86 58 87 WK_EXPORT WKTypeID WKBundleGetTypeID(); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h
r149417 r159981 45 45 typedef bool (*WKBundlePageBannerMouseDraggedCallback)(WKBundlePageBannerRef pageBanner, WKPoint position, WKEventMouseButton mouseButton, const void* clientInfo); 46 46 47 struct WKBundlePageBannerClient{47 typedef struct WKBundlePageBannerClientBase { 48 48 int version; 49 49 const void * clientInfo; 50 } WKBundlePageBannerClientBase; 51 52 typedef struct WKBundlePageBannerClientV0 { 53 WKBundlePageBannerClientBase base; 54 55 // Version 0. 50 56 WKBundlePageBannerMouseDownCallback mouseDown; 51 57 WKBundlePageBannerMouseUpCallback mouseUp; 52 58 WKBundlePageBannerMouseMovedCallback mouseMoved; 53 59 WKBundlePageBannerMouseDraggedCallback mouseDragged; 54 }; 55 typedef struct WKBundlePageBannerClient WKBundlePageBannerClient; 60 } WKBundlePageBannerClientV0; 56 61 62 // FIXME: Deprecate. 57 63 enum { kWKBundlePageBannerClientCurrentVersion = 0 }; 58 64 typedef struct WKBundlePageBannerClient { 65 int version; 66 const void * clientInfo; 67 68 // Version 0. 69 WKBundlePageBannerMouseDownCallback mouseDown; 70 WKBundlePageBannerMouseUpCallback mouseUp; 71 WKBundlePageBannerMouseMovedCallback mouseMoved; 72 WKBundlePageBannerMouseDraggedCallback mouseDragged; 73 } WKBundlePageBannerClient; 74 75 59 76 WK_EXPORT WKTypeID WKBundlePageBannerGetTypeID(); 60 77 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h
r159976 r159981 31 31 typedef void (*WKBundlePageGetContextMenuFromDefaultContextMenuCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKArrayRef defaultMenu, WKArrayRef* newMenu, WKTypeRef* userData, const void* clientInfo); 32 32 33 struct WKBundlePageContextMenuClient{33 typedef struct WKBundlePageContextMenuClientBase { 34 34 int version; 35 35 const void * clientInfo; 36 } WKBundlePageContextMenuClientBase; 37 38 typedef struct WKBundlePageContextMenuClientV0 { 39 WKBundlePageContextMenuClientBase base; 40 41 // Version 0. 36 42 WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu; 37 }; 38 typedef struct WKBundlePageContextMenuClient WKBundlePageContextMenuClient; 43 } WKBundlePageContextMenuClientV0; 39 44 45 // FIXME: Deprecate. 40 46 enum { kWKBundlePageContextMenuClientCurrentVersion = 0 }; 47 typedef struct WKBundlePageContextMenuClient { 48 int version; 49 const void * clientInfo; 50 51 // Version 0. 52 WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu; 53 } WKBundlePageContextMenuClient; 41 54 42 55 #endif // WKBundlePageContextMenuClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h
r159976 r159981 31 31 typedef void (*WKBundlePageDiagnosticLoggingCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKStringRef success, const void* clientInfo); 32 32 33 struct WKBundlePageDiagnosticLoggingClient{33 typedef struct WKBundlePageDiagnosticLoggingClientBase { 34 34 int version; 35 35 const void * clientInfo; 36 } WKBundlePageDiagnosticLoggingClientBase; 37 38 typedef struct WKBundlePageDiagnosticLoggingClientV0 { 39 WKBundlePageDiagnosticLoggingClientBase base; 40 41 // Version 0. 36 42 WKBundlePageDiagnosticLoggingCallback logDiagnosticMessage; 37 }; 38 typedef struct WKBundlePageDiagnosticLoggingClient WKBundlePageDiagnosticLoggingClient; 43 } WKBundlePageDiagnosticLoggingClientV0; 39 44 45 // FIXME: Deprecate. 40 46 enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion = 0 }; 47 typedef struct WKBundlePageDiagnosticLoggingClient { 48 int version; 49 const void * clientInfo; 50 51 // Version 0. 52 WKBundlePageDiagnosticLoggingCallback logDiagnosticMessage; 53 } WKBundlePageDiagnosticLoggingClient; 41 54 42 55 #endif // WKBundlePageDiagnosticLoggingClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h
r159976 r159981 71 71 typedef void (*WKBundlePageDidWriteToPasteboard)(WKBundlePageRef page, const void* clientInfo); 72 72 73 struct WKBundlePageEditorClient{73 typedef struct WKBundlePageEditorClientBase { 74 74 int version; 75 75 const void * clientInfo; 76 } WKBundlePageEditorClientBase; 77 78 typedef struct WKBundlePageEditorClientV0 { 79 WKBundlePageEditorClientBase base; 80 81 // Version 0. 76 82 WKBundlePageShouldBeginEditingCallback shouldBeginEditing; 77 83 WKBundlePageShouldEndEditingCallback shouldEndEditing; … … 85 91 WKBundlePageEditingNotification didChange; 86 92 WKBundlePageEditingNotification didChangeSelection; 93 } WKBundlePageEditorClientV0; 94 95 typedef struct WKBundlePageEditorClientV1 { 96 WKBundlePageEditorClientBase base; 97 98 // Version 0. 99 WKBundlePageShouldBeginEditingCallback shouldBeginEditing; 100 WKBundlePageShouldEndEditingCallback shouldEndEditing; 101 WKBundlePageShouldInsertNodeCallback shouldInsertNode; 102 WKBundlePageShouldInsertTextCallback shouldInsertText; 103 WKBundlePageShouldDeleteRangeCallback shouldDeleteRange; 104 WKBundlePageShouldChangeSelectedRange shouldChangeSelectedRange; 105 WKBundlePageShouldApplyStyle shouldApplyStyle; 106 WKBundlePageEditingNotification didBeginEditing; 107 WKBundlePageEditingNotification didEndEditing; 108 WKBundlePageEditingNotification didChange; 109 WKBundlePageEditingNotification didChangeSelection; 110 87 111 // Version 1. 88 112 WKBundlePageWillWriteToPasteboard willWriteToPasteboard; 89 113 WKBundlePageGetPasteboardDataForRange getPasteboardDataForRange; 90 114 WKBundlePageDidWriteToPasteboard didWriteToPasteboard; 91 }; 92 typedef struct WKBundlePageEditorClient WKBundlePageEditorClient; 115 } WKBundlePageEditorClientV1; 93 116 117 // FIXME: Deprecate. 94 118 enum { kWKBundlePageEditorClientCurrentVersion = 1 }; 119 typedef struct WKBundlePageEditorClient { 120 int version; 121 const void * clientInfo; 122 123 // Version 0. 124 WKBundlePageShouldBeginEditingCallback shouldBeginEditing; 125 WKBundlePageShouldEndEditingCallback shouldEndEditing; 126 WKBundlePageShouldInsertNodeCallback shouldInsertNode; 127 WKBundlePageShouldInsertTextCallback shouldInsertText; 128 WKBundlePageShouldDeleteRangeCallback shouldDeleteRange; 129 WKBundlePageShouldChangeSelectedRange shouldChangeSelectedRange; 130 WKBundlePageShouldApplyStyle shouldApplyStyle; 131 WKBundlePageEditingNotification didBeginEditing; 132 WKBundlePageEditingNotification didEndEditing; 133 WKBundlePageEditingNotification didChange; 134 WKBundlePageEditingNotification didChangeSelection; 135 136 // Version 1. 137 WKBundlePageWillWriteToPasteboard willWriteToPasteboard; 138 WKBundlePageGetPasteboardDataForRange getPasteboardDataForRange; 139 WKBundlePageDidWriteToPasteboard didWriteToPasteboard; 140 } WKBundlePageEditorClient; 95 141 96 142 #endif // WKBundlePageEditorClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h
r159976 r159981 40 40 typedef void (*WKBundlePageDidAssociateFormControlsCallback)(WKBundlePageRef page, WKArrayRef elementHandles, const void* clientInfo); 41 41 42 struct WKBundlePageFormClient { 42 typedef struct WKBundlePageFormClientBase { 43 int version; 44 const void * clientInfo; 45 } WKBundlePageFormClientBase; 46 47 typedef struct WKBundlePageFormClientV0 { 48 WKBundlePageFormClientBase base; 49 50 // Version 0. 51 WKBundlePageTextFieldDidBeginEditingCallback textFieldDidBeginEditing; 52 WKBundlePageTextFieldDidEndEditingCallback textFieldDidEndEditing; 53 WKBundlePageTextDidChangeInTextFieldCallback textDidChangeInTextField; 54 WKBundlePageTextDidChangeInTextAreaCallback textDidChangeInTextArea; 55 WKBundlePageShouldPerformActionInTextFieldCallback shouldPerformActionInTextField; 56 WKBundlePageWillSubmitFormCallback willSubmitForm; 57 } WKBundlePageFormClientV0; 58 59 typedef struct WKBundlePageFormClientV1 { 60 WKBundlePageFormClientBase base; 61 62 // Version 0. 63 WKBundlePageTextFieldDidBeginEditingCallback textFieldDidBeginEditing; 64 WKBundlePageTextFieldDidEndEditingCallback textFieldDidEndEditing; 65 WKBundlePageTextDidChangeInTextFieldCallback textDidChangeInTextField; 66 WKBundlePageTextDidChangeInTextAreaCallback textDidChangeInTextArea; 67 WKBundlePageShouldPerformActionInTextFieldCallback shouldPerformActionInTextField; 68 WKBundlePageWillSubmitFormCallback willSubmitForm; 69 70 // Version 1. 71 WKBundlePageWillSendSubmitEventCallback willSendSubmitEvent; 72 } WKBundlePageFormClientV1; 73 74 typedef struct WKBundlePageFormClientV2 { 75 WKBundlePageFormClientBase base; 76 77 // Version 0. 78 WKBundlePageTextFieldDidBeginEditingCallback textFieldDidBeginEditing; 79 WKBundlePageTextFieldDidEndEditingCallback textFieldDidEndEditing; 80 WKBundlePageTextDidChangeInTextFieldCallback textDidChangeInTextField; 81 WKBundlePageTextDidChangeInTextAreaCallback textDidChangeInTextArea; 82 WKBundlePageShouldPerformActionInTextFieldCallback shouldPerformActionInTextField; 83 WKBundlePageWillSubmitFormCallback willSubmitForm; 84 85 // Version 1. 86 WKBundlePageWillSendSubmitEventCallback willSendSubmitEvent; 87 88 // version 2. 89 WKBundlePageDidFocusTextFieldCallback didFocusTextField; 90 WKBundlePageShouldNotifyOnFormChangesCallback shouldNotifyOnFormChanges; 91 WKBundlePageDidAssociateFormControlsCallback didAssociateFormControls; 92 } WKBundlePageFormClientV2; 93 94 // FIXME: Deprecate. 95 enum { kWKBundlePageFormClientCurrentVersion = 2 }; 96 typedef struct WKBundlePageFormClient { 43 97 int version; 44 98 const void * clientInfo; … … 59 113 WKBundlePageShouldNotifyOnFormChangesCallback shouldNotifyOnFormChanges; 60 114 WKBundlePageDidAssociateFormControlsCallback didAssociateFormControls; 61 }; 62 typedef struct WKBundlePageFormClient WKBundlePageFormClient; 63 64 enum { kWKBundlePageFormClientCurrentVersion = 2 }; 115 } WKBundlePageFormClient; 65 116 66 117 #endif // WKBundlePageFormClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h
r159976 r159981 37 37 typedef void (*WKBundlePageCloseFullScreen)(WKBundlePageRef page); 38 38 39 struct WKBundlePageFullScreenClient { 39 typedef struct WKBundlePageFullScreenClientBase { 40 int version; 41 const void * clientInfo; 42 } WKBundlePageFullScreenClientBase; 43 44 typedef struct WKBundlePageFullScreenClientV0 { 45 WKBundlePageFullScreenClientBase base; 46 47 // Version 0. 48 WKBundlePageSupportsFullScreen supportsFullScreen; 49 WKBundlePageEnterFullScreenForElement enterFullScreenForElement; 50 WKBundlePageExitFullScreenForElement exitFullScreenForElement; 51 } WKBundlePageFullScreenClientV0; 52 53 typedef struct WKBundlePageFullScreenClientV1 { 54 WKBundlePageFullScreenClientBase base; 55 56 // Version 0. 57 WKBundlePageSupportsFullScreen supportsFullScreen; 58 WKBundlePageEnterFullScreenForElement enterFullScreenForElement; 59 WKBundlePageExitFullScreenForElement exitFullScreenForElement; 60 61 // Version 1. 62 WKBundlePageBeganEnterFullScreen beganEnterFullScreen; 63 WKBundlePageBeganExitFullScreen beganExitFullScreen; 64 WKBundlePageCloseFullScreen closeFullScreen; 65 } WKBundlePageFullScreenClientV1; 66 67 // FIXME: Deprecate. 68 enum { kWKBundlePageFullScreenClientCurrentVersion = 1 }; 69 typedef struct WKBundlePageFullScreenClient { 40 70 int version; 41 71 const void * clientInfo; … … 50 80 WKBundlePageBeganExitFullScreen beganExitFullScreen; 51 81 WKBundlePageCloseFullScreen closeFullScreen; 52 }; 53 typedef struct WKBundlePageFullScreenClient WKBundlePageFullScreenClient; 54 55 enum { kWKBundlePageFullScreenClientCurrentVersion = 1 }; 82 } WKBundlePageFullScreenClient; 56 83 57 84 #endif // WKBundlePageFullScreenClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h
r159976 r159981 64 64 typedef void (*WKBundlePageWillDestroyFrame)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo); 65 65 66 struct WKBundlePageLoaderClient { 66 typedef struct WKBundlePageLoaderClientBase { 67 int version; 68 const void * clientInfo; 69 } WKBundlePageLoaderClientBase; 70 71 typedef struct WKBundlePageLoaderClientV0 { 72 WKBundlePageLoaderClientBase base; 73 74 // Version 0. 75 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 76 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 77 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 78 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 79 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 80 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 81 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 82 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 83 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 84 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 85 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 86 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 87 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 88 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 89 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 90 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 91 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 92 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 93 } WKBundlePageLoaderClientV0; 94 95 typedef struct WKBundlePageLoaderClientV1 { 96 WKBundlePageLoaderClientBase base; 97 98 // Version 0. 99 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 100 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 101 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 102 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 103 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 104 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 105 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 106 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 107 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 108 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 109 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 110 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 111 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 112 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 113 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 114 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 115 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 116 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 117 118 // Version 1. 119 WKBundlePageDidLayoutForFrameCallback didLayoutForFrame; 120 void * didNewFirstVisuallyNonEmptyLayout_unavailable; 121 WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame; 122 WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 123 WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame; 124 WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject; 125 WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject; 126 WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension; 127 } WKBundlePageLoaderClientV1; 128 129 typedef struct WKBundlePageLoaderClientV2 { 130 WKBundlePageLoaderClientBase base; 131 132 // Version 0. 133 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 134 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 135 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 136 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 137 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 138 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 139 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 140 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 141 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 142 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 143 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 144 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 145 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 146 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 147 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 148 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 149 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 150 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 151 152 // Version 1. 153 WKBundlePageDidLayoutForFrameCallback didLayoutForFrame; 154 void * didNewFirstVisuallyNonEmptyLayout_unavailable; 155 WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame; 156 WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 157 WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame; 158 WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject; 159 WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject; 160 WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension; 161 162 // Version 2 163 WKBundlePageDidFinishProgressCallback didFinishProgress; 164 WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL; 165 } WKBundlePageLoaderClientV2; 166 167 typedef struct WKBundlePageLoaderClientV3 { 168 WKBundlePageLoaderClientBase base; 169 170 // Version 0. 171 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 172 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 173 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 174 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 175 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 176 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 177 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 178 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 179 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 180 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 181 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 182 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 183 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 184 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 185 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 186 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 187 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 188 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 189 190 // Version 1. 191 WKBundlePageDidLayoutForFrameCallback didLayoutForFrame; 192 void * didNewFirstVisuallyNonEmptyLayout_unavailable; 193 WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame; 194 WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 195 WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame; 196 WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject; 197 WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject; 198 WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension; 199 200 // Version 2 201 WKBundlePageDidFinishProgressCallback didFinishProgress; 202 WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL; 203 204 // Version 3 205 void * didReceiveIntentForFrame_unavailable; 206 void * registerIntentServiceForFrame_unavailable; 207 } WKBundlePageLoaderClientV3; 208 209 typedef struct WKBundlePageLoaderClientV4 { 210 WKBundlePageLoaderClientBase base; 211 212 // Version 0. 213 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 214 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 215 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 216 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 217 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 218 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 219 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 220 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 221 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 222 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 223 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 224 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 225 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 226 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 227 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 228 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 229 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 230 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 231 232 // Version 1. 233 WKBundlePageDidLayoutForFrameCallback didLayoutForFrame; 234 void * didNewFirstVisuallyNonEmptyLayout_unavailable; 235 WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame; 236 WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 237 WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame; 238 WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject; 239 WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject; 240 WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension; 241 242 // Version 2 243 WKBundlePageDidFinishProgressCallback didFinishProgress; 244 WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL; 245 246 // Version 3 247 void * didReceiveIntentForFrame_unavailable; 248 void * registerIntentServiceForFrame_unavailable; 249 250 // Version 4 251 WKBundlePageDidLayoutCallback didLayout; 252 } WKBundlePageLoaderClientV4; 253 254 typedef struct WKBundlePageLoaderClientV5 { 255 WKBundlePageLoaderClientBase base; 256 257 // Version 0. 258 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 259 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 260 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 261 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 262 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 263 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 264 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 265 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 266 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 267 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 268 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 269 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 270 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 271 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 272 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 273 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 274 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 275 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 276 277 // Version 1. 278 WKBundlePageDidLayoutForFrameCallback didLayoutForFrame; 279 void * didNewFirstVisuallyNonEmptyLayout_unavailable; 280 WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame; 281 WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 282 WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame; 283 WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject; 284 WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject; 285 WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension; 286 287 // Version 2 288 WKBundlePageDidFinishProgressCallback didFinishProgress; 289 WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL; 290 291 // Version 3 292 void * didReceiveIntentForFrame_unavailable; 293 void * registerIntentServiceForFrame_unavailable; 294 295 // Version 4 296 WKBundlePageDidLayoutCallback didLayout; 297 298 // Version 5 299 WKBundlePageFeaturesUsedInPageCallback featuresUsedInPage; 300 } WKBundlePageLoaderClientV5; 301 302 typedef struct WKBundlePageLoaderClientV6 { 303 WKBundlePageLoaderClientBase base; 304 305 // Version 0. 306 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 307 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 308 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 309 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 310 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 311 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 312 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 313 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 314 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 315 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 316 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 317 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 318 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 319 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 320 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 321 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 322 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 323 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 324 325 // Version 1. 326 WKBundlePageDidLayoutForFrameCallback didLayoutForFrame; 327 void * didNewFirstVisuallyNonEmptyLayout_unavailable; 328 WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame; 329 WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 330 WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame; 331 WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject; 332 WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject; 333 WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension; 334 335 // Version 2 336 WKBundlePageDidFinishProgressCallback didFinishProgress; 337 WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL; 338 339 // Version 3 340 void * didReceiveIntentForFrame_unavailable; 341 void * registerIntentServiceForFrame_unavailable; 342 343 // Version 4 344 WKBundlePageDidLayoutCallback didLayout; 345 346 // Version 5 347 WKBundlePageFeaturesUsedInPageCallback featuresUsedInPage; 348 349 // Version 6 350 WKBundlePageWillLoadURLRequestCallback willLoadURLRequest; 351 WKBundlePageWillLoadDataRequestCallback willLoadDataRequest; 352 } WKBundlePageLoaderClientV6; 353 354 typedef struct WKBundlePageLoaderClientV7 { 355 WKBundlePageLoaderClientBase base; 356 357 // Version 0. 358 WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame; 359 WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame; 360 WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame; 361 WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame; 362 WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame; 363 WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame; 364 WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame; 365 WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame; 366 WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame; 367 WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame; 368 WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame; 369 WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy; 370 WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame; 371 WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame; 372 WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame; 373 WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame; 374 WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame; 375 WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame; 376 377 // Version 1. 378 WKBundlePageDidLayoutForFrameCallback didLayoutForFrame; 379 void * didNewFirstVisuallyNonEmptyLayout_unavailable; 380 WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame; 381 WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem; 382 WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame; 383 WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject; 384 WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject; 385 WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension; 386 387 // Version 2 388 WKBundlePageDidFinishProgressCallback didFinishProgress; 389 WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL; 390 391 // Version 3 392 void * didReceiveIntentForFrame_unavailable; 393 void * registerIntentServiceForFrame_unavailable; 394 395 // Version 4 396 WKBundlePageDidLayoutCallback didLayout; 397 398 // Version 5 399 WKBundlePageFeaturesUsedInPageCallback featuresUsedInPage; 400 401 // Version 6 402 WKBundlePageWillLoadURLRequestCallback willLoadURLRequest; 403 WKBundlePageWillLoadDataRequestCallback willLoadDataRequest; 404 405 // Version 7 406 WKBundlePageWillDestroyFrame willDestroyFrame; 407 } WKBundlePageLoaderClientV7; 408 409 // FIXME: Deprecate. 410 enum { kWKBundlePageLoaderClientCurrentVersion = 7 }; 411 typedef struct WKBundlePageLoaderClient { 67 412 int version; 68 413 const void * clientInfo; … … 118 463 // Version 7 119 464 WKBundlePageWillDestroyFrame willDestroyFrame; 120 }; 121 typedef struct WKBundlePageLoaderClient WKBundlePageLoaderClient; 122 123 enum { kWKBundlePageLoaderClientCurrentVersion = 7 }; 465 } WKBundlePageLoaderClient; 124 466 125 467 #endif // WKBundlePageLoaderClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h
r153404 r159981 50 50 typedef bool (*WKBundlePageOverlayMouseDraggedCallback)(WKBundlePageOverlayRef pageOverlay, WKPoint position, WKEventMouseButton mouseButton, const void* clientInfo); 51 51 52 struct WKBundlePageOverlayClient{52 typedef struct WKBundlePageOverlayClientBase { 53 53 int version; 54 54 const void * clientInfo; 55 } WKBundlePageOverlayClientBase; 56 57 typedef struct WKBundlePageOverlayClientV0 { 58 WKBundlePageOverlayClientBase base; 59 60 // Version 0. 55 61 WKBundlePageOverlayWillMoveToPageCallback willMoveToPage; 56 62 WKBundlePageOverlayDidMoveToPageCallback didMoveToPage; … … 60 66 WKBundlePageOverlayMouseMovedCallback mouseMoved; 61 67 WKBundlePageOverlayMouseDraggedCallback mouseDragged; 62 }; 63 typedef struct WKBundlePageOverlayClient WKBundlePageOverlayClient; 68 } WKBundlePageOverlayClientV0; 64 69 65 enum { kWKBundlePageOverlayClientCurrentVersion = 0 }; 66 70 // FIXME: Deprecate. 71 enum { kWKBundlePageOverlayClientCurrentVersion = 0 }; 72 typedef struct WKBundlePageOverlayClient { 73 int version; 74 const void * clientInfo; 75 76 // Version 0. 77 WKBundlePageOverlayWillMoveToPageCallback willMoveToPage; 78 WKBundlePageOverlayDidMoveToPageCallback didMoveToPage; 79 WKBundlePageOverlayDrawRectCallback drawRect; 80 WKBundlePageOverlayMouseDownCallback mouseDown; 81 WKBundlePageOverlayMouseUpCallback mouseUp; 82 WKBundlePageOverlayMouseMovedCallback mouseMoved; 83 WKBundlePageOverlayMouseDraggedCallback mouseDragged; 84 } WKBundlePageOverlayClient; 85 67 86 typedef WKTypeRef (*WKAccessibilityAttributeValueCallback)(WKBundlePageOverlayRef pageOverlay, WKStringRef attribute, WKTypeRef parameter, const void* clientInfo); 68 87 typedef WKArrayRef (*WKAccessibilityAttributeNamesCallback)(WKBundlePageOverlayRef pageOverlay, bool parameterizedNames, const void* clientInfo); 69 70 struct WKBundlePageOverlayAccessibilityClient{88 89 typedef struct WKBundlePageOverlayAccessibilityClientBase { 71 90 int version; 72 91 const void * clientInfo; 92 } WKBundlePageOverlayAccessibilityClientBase; 93 94 typedef struct WKBundlePageOverlayAccessibilityClientV0 { 95 WKBundlePageOverlayAccessibilityClientBase base; 96 97 // Version 0. 73 98 WKAccessibilityAttributeValueCallback copyAccessibilityAttributeValue; 74 99 WKAccessibilityAttributeNamesCallback copyAccessibilityAttributeNames; 75 } ;76 typedef struct WKBundlePageOverlayAccessibilityClient WKBundlePageOverlayAccessibilityClient; 77 100 } WKBundlePageOverlayAccessibilityClientV0; 101 102 // FIXME: Deprecate. 78 103 enum { kWKBundlePageOverlayAccessibilityClientCurrentVersion = 0 }; 104 typedef struct WKBundlePageOverlayAccessibilityClient { 105 int version; 106 const void * clientInfo; 107 108 // Version 0. 109 WKAccessibilityAttributeValueCallback copyAccessibilityAttributeValue; 110 WKAccessibilityAttributeNamesCallback copyAccessibilityAttributeNames; 111 } WKBundlePageOverlayAccessibilityClient; 79 112 80 113 WK_EXPORT WKTypeID WKBundlePageOverlayGetTypeID(); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h
r159976 r159981 40 40 typedef void (*WKBundlePageUnableToImplementPolicyCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKErrorRef error, WKTypeRef* userData, const void* clientInfo); 41 41 42 struct WKBundlePagePolicyClient{42 typedef struct WKBundlePagePolicyClientBase { 43 43 int version; 44 44 const void * clientInfo; 45 } WKBundlePagePolicyClientBase; 46 47 typedef struct WKBundlePagePolicyClientV0 { 48 WKBundlePagePolicyClientBase base; 49 50 // Version 0. 45 51 WKBundlePageDecidePolicyForNavigationActionCallback decidePolicyForNavigationAction; 46 52 WKBundlePageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction; 47 53 WKBundlePageDecidePolicyForResponseCallback decidePolicyForResponse; 48 54 WKBundlePageUnableToImplementPolicyCallback unableToImplementPolicy; 49 }; 50 typedef struct WKBundlePagePolicyClient WKBundlePagePolicyClient; 55 } WKBundlePagePolicyClientV0; 51 56 57 // FIXME: Deprecate. 52 58 enum { kWKBundlePagePolicyClientCurrentVersion = 0 }; 59 typedef struct WKBundlePagePolicyClient { 60 int version; 61 const void * clientInfo; 53 62 63 // Version 0. 64 WKBundlePageDecidePolicyForNavigationActionCallback decidePolicyForNavigationAction; 65 WKBundlePageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction; 66 WKBundlePageDecidePolicyForResponseCallback decidePolicyForResponse; 67 WKBundlePageUnableToImplementPolicyCallback unableToImplementPolicy; 68 } WKBundlePagePolicyClient; 54 69 55 70 #endif // WKBundlePagePolicyClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h
r159976 r159981 38 38 typedef bool (*WKBundlePageShouldUseCredentialStorageCallback)(WKBundlePageRef, WKBundleFrameRef, uint64_t resourceIdentifier, const void* clientInfo); 39 39 40 struct WKBundlePageResourceLoadClient { 40 typedef struct WKBundlePageResourceLoadClientBase { 41 int version; 42 const void * clientInfo; 43 } WKBundlePageResourceLoadClientBase; 44 45 typedef struct WKBundlePageResourceLoadClientV0 { 46 WKBundlePageResourceLoadClientBase base; 47 48 // Version 0. 49 WKBundlePageDidInitiateLoadForResourceCallback didInitiateLoadForResource; 50 51 // willSendRequestForFrame is supposed to return a retained reference to the URL request. 52 WKBundlePageWillSendRequestForFrameCallback willSendRequestForFrame; 53 54 WKBundlePageDidReceiveResponseForResourceCallback didReceiveResponseForResource; 55 WKBundlePageDidReceiveContentLengthForResourceCallback didReceiveContentLengthForResource; 56 WKBundlePageDidFinishLoadForResourceCallback didFinishLoadForResource; 57 WKBundlePageDidFailLoadForResourceCallback didFailLoadForResource; 58 } WKBundlePageResourceLoadClientV0; 59 60 typedef struct WKBundlePageResourceLoadClientV1 { 61 WKBundlePageResourceLoadClientBase base; 62 63 // Version 0. 64 WKBundlePageDidInitiateLoadForResourceCallback didInitiateLoadForResource; 65 66 // willSendRequestForFrame is supposed to return a retained reference to the URL request. 67 WKBundlePageWillSendRequestForFrameCallback willSendRequestForFrame; 68 69 WKBundlePageDidReceiveResponseForResourceCallback didReceiveResponseForResource; 70 WKBundlePageDidReceiveContentLengthForResourceCallback didReceiveContentLengthForResource; 71 WKBundlePageDidFinishLoadForResourceCallback didFinishLoadForResource; 72 WKBundlePageDidFailLoadForResourceCallback didFailLoadForResource; 73 74 // Version 1. 75 WKBundlePageShouldCacheResponseCallback shouldCacheResponse; 76 WKBundlePageShouldUseCredentialStorageCallback shouldUseCredentialStorage; 77 } WKBundlePageResourceLoadClientV1; 78 79 // FIXME: Deprecate. 80 enum { kWKBundlePageResourceLoadClientCurrentVersion = 1 }; 81 typedef struct WKBundlePageResourceLoadClient { 41 82 int version; 42 83 const void * clientInfo; … … 56 97 WKBundlePageShouldCacheResponseCallback shouldCacheResponse; 57 98 WKBundlePageShouldUseCredentialStorageCallback shouldUseCredentialStorage; 58 }; 59 typedef struct WKBundlePageResourceLoadClient WKBundlePageResourceLoadClient; 60 61 enum { kWKBundlePageResourceLoadClientCurrentVersion = 1 }; 99 } WKBundlePageResourceLoadClient; 62 100 63 101 #endif // WKBundlePageResourceLoadClient_h -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h
r159976 r159981 56 56 typedef WKStringRef (*WKBundlePagePlugInCreateExtraScriptCallback)(const void *clientInfo); 57 57 58 struct WKBundlePageUIClient{58 typedef struct WKBundlePageUIClientBase { 59 59 int version; 60 60 const void * clientInfo; 61 } WKBundlePageUIClientBase; 62 63 typedef struct WKBundlePageUIClientV0 { 64 WKBundlePageUIClientBase base; 65 66 // Version 0. 67 WKBundlePageWillAddMessageToConsoleCallback willAddMessageToConsole; 68 WKBundlePageWillSetStatusbarTextCallback willSetStatusbarText; 69 WKBundlePageWillRunJavaScriptAlertCallback willRunJavaScriptAlert; 70 WKBundlePageWillRunJavaScriptConfirmCallback willRunJavaScriptConfirm; 71 WKBundlePageWillRunJavaScriptPromptCallback willRunJavaScriptPrompt; 72 WKBundlePageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 73 WKBundlePageDidScrollCallback pageDidScroll; 74 void* unused1; 75 WKBundlePageGenerateFileForUploadCallback shouldGenerateFileForUpload; 76 WKBundlePageGenerateFileForUploadCallback generateFileForUpload; 77 void* unused2; 78 WKBundlePageStatusBarIsVisibleCallback statusBarIsVisible; 79 WKBundlePageMenuBarIsVisibleCallback menuBarIsVisible; 80 WKBundlePageToolbarsAreVisibleCallback toolbarsAreVisible; 81 } WKBundlePageUIClientV0; 82 83 typedef struct WKBundlePageUIClientV1 { 84 WKBundlePageUIClientBase base; 85 86 // Version 0. 87 WKBundlePageWillAddMessageToConsoleCallback willAddMessageToConsole; 88 WKBundlePageWillSetStatusbarTextCallback willSetStatusbarText; 89 WKBundlePageWillRunJavaScriptAlertCallback willRunJavaScriptAlert; 90 WKBundlePageWillRunJavaScriptConfirmCallback willRunJavaScriptConfirm; 91 WKBundlePageWillRunJavaScriptPromptCallback willRunJavaScriptPrompt; 92 WKBundlePageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 93 WKBundlePageDidScrollCallback pageDidScroll; 94 void* unused1; 95 WKBundlePageGenerateFileForUploadCallback shouldGenerateFileForUpload; 96 WKBundlePageGenerateFileForUploadCallback generateFileForUpload; 97 void* unused2; 98 WKBundlePageStatusBarIsVisibleCallback statusBarIsVisible; 99 WKBundlePageMenuBarIsVisibleCallback menuBarIsVisible; 100 WKBundlePageToolbarsAreVisibleCallback toolbarsAreVisible; 101 102 // Version 1. 103 WKBundlePageReachedAppCacheOriginQuotaCallback didReachApplicationCacheOriginQuota; 104 } WKBundlePageUIClientV1; 105 106 typedef struct WKBundlePageUIClientV2 { 107 WKBundlePageUIClientBase base; 108 109 // Version 0. 61 110 WKBundlePageWillAddMessageToConsoleCallback willAddMessageToConsole; 62 111 WKBundlePageWillSetStatusbarTextCallback willSetStatusbarText; … … 83 132 WKBundlePagePlugInCreateExtraStyleSheetCallback createPlugInExtraStyleSheet; 84 133 WKBundlePagePlugInCreateExtraScriptCallback createPlugInExtraScript; 85 }; 86 typedef struct WKBundlePageUIClient WKBundlePageUIClient; 134 } WKBundlePageUIClientV2; 87 135 136 // FIXME: Deprecate. 88 137 enum { kWKBundlePageUIClientCurrentVersion = 2 }; 138 typedef struct WKBundlePageUIClient { 139 int version; 140 const void * clientInfo; 141 142 // Version 0. 143 WKBundlePageWillAddMessageToConsoleCallback willAddMessageToConsole; 144 WKBundlePageWillSetStatusbarTextCallback willSetStatusbarText; 145 WKBundlePageWillRunJavaScriptAlertCallback willRunJavaScriptAlert; 146 WKBundlePageWillRunJavaScriptConfirmCallback willRunJavaScriptConfirm; 147 WKBundlePageWillRunJavaScriptPromptCallback willRunJavaScriptPrompt; 148 WKBundlePageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 149 WKBundlePageDidScrollCallback pageDidScroll; 150 void* unused1; 151 WKBundlePageGenerateFileForUploadCallback shouldGenerateFileForUpload; 152 WKBundlePageGenerateFileForUploadCallback generateFileForUpload; 153 void* unused2; 154 WKBundlePageStatusBarIsVisibleCallback statusBarIsVisible; 155 WKBundlePageMenuBarIsVisibleCallback menuBarIsVisible; 156 WKBundlePageToolbarsAreVisibleCallback toolbarsAreVisible; 157 158 // Version 1. 159 WKBundlePageReachedAppCacheOriginQuotaCallback didReachApplicationCacheOriginQuota; 160 161 // Version 2. 162 WKBundlePageExceededDatabaseQuotaCallback didExceedDatabaseQuota; 163 WKBundlePagePlugInCreateStartLabelTitleCallback createPlugInStartLabelTitle; 164 WKBundlePagePlugInCreateStartLabelSubtitleCallback createPlugInStartLabelSubtitle; 165 WKBundlePagePlugInCreateExtraStyleSheetCallback createPlugInExtraStyleSheet; 166 WKBundlePagePlugInCreateExtraScriptCallback createPlugInExtraScript; 167 } WKBundlePageUIClient; 89 168 90 169 #endif // WKBundlePageUIClient_h
Note: See TracChangeset
for help on using the changeset viewer.