Diff
Modified: trunk/Source/WebKit2/ChangeLog (188278 => 188279)
--- trunk/Source/WebKit2/ChangeLog 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-11 19:48:50 UTC (rev 188279)
@@ -1,3 +1,42 @@
+2015-08-11 Anders Carlsson <[email protected]>
+
+ Remove unversioned client structs from the C SPI
+ https://bugs.webkit.org/show_bug.cgi?id=147894
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/c/WKConnectionRef.h:
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/C/WKContextConnectionClient.h:
+ * UIProcess/API/C/WKContextDownloadClient.h:
+ * UIProcess/API/C/WKContextHistoryClient.h:
+ * UIProcess/API/C/WKContextInjectedBundleClient.h:
+ * UIProcess/API/C/WKCookieManager.h:
+ * UIProcess/API/C/WKDatabaseManager.h:
+ * UIProcess/API/C/WKGeolocationManager.h:
+ * UIProcess/API/C/WKIconDatabase.h:
+ * UIProcess/API/C/WKNotificationProvider.h:
+ * UIProcess/API/C/WKPageContextMenuClient.h:
+ * UIProcess/API/C/WKPageDiagnosticLoggingClient.h:
+ * UIProcess/API/C/WKPageFindClient.h:
+ * UIProcess/API/C/WKPageFindMatchesClient.h:
+ * UIProcess/API/C/WKPageFormClient.h:
+ * UIProcess/API/C/WKPageLoaderClient.h:
+ * UIProcess/API/C/WKPagePolicyClient.h:
+ * UIProcess/API/C/WKPageUIClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundle.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h:
+
2015-08-11 Dan Bernstein <[email protected]>
Reverted r188255, because it turned out that delegates do nonot need this information.
Modified: trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h (188278 => 188279)
--- trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/Shared/API/c/WKConnectionRef.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -48,16 +48,6 @@
WKConnectionDidCloseCallback didClose;
} WKConnectionClientV0;
-enum { WKConnectionClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKConnectionClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKConnectionDidReceiveMessageCallback didReceiveMessage;
- WKConnectionDidCloseCallback didClose;
-} WKConnectionClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
WK_EXPORT WKTypeID WKConnectionGetTypeID();
WK_EXPORT void WKConnectionSetConnectionClient(WKConnectionRef connection, const WKConnectionClientBase* client);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -75,17 +75,6 @@
WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
} WKContextClientV1;
-enum { kWKContextClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKContextClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKContextPlugInAutoStartOriginHashesChangedCallback plugInAutoStartOriginHashesChanged;
- WKContextNetworkProcessDidCrashCallback networkProcessDidCrash;
- WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable;
-} WKContextClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
enum {
kWKProcessModelSharedSecondaryProcess = 0,
kWKProcessModelMultipleSecondaryProcesses = 1
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -42,13 +42,4 @@
WKContextDidCreateConnection didCreateConnection;
} WKContextConnectionClientV0;
-enum { kWKContextConnectionClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKContextConnectionClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKContextDidCreateConnection didCreateConnection;
-} WKContextConnectionClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKContextConnectionClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -62,23 +62,4 @@
WKContextDownloadProcessDidCrashCallback processDidCrash;
} WKContextDownloadClientV0;
-enum { kWKContextDownloadClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKContextDownloadClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKContextDownloadDidStartCallback didStart;
- WKContextDownloadDidReceiveAuthenticationChallengeCallback didReceiveAuthenticationChallenge;
- WKContextDownloadDidReceiveResponseCallback didReceiveResponse;
- WKContextDownloadDidReceiveDataCallback didReceiveData;
- WKContextDownloadShouldDecodeSourceDataOfMIMETypeCallback shouldDecodeSourceDataOfMIMEType;
- WKContextDownloadDecideDestinationWithSuggestedFilenameCallback decideDestinationWithSuggestedFilename;
- WKContextDownloadDidCreateDestinationCallback didCreateDestination;
- WKContextDownloadDidFinishCallback didFinish;
- WKContextDownloadDidFailCallback didFail;
- WKContextDownloadDidCancel didCancel;
- WKContextDownloadProcessDidCrashCallback processDidCrash;
-} WKContextDownloadClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKContextDownloadClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -50,17 +50,4 @@
WKContextPopulateVisitedLinksCallback populateVisitedLinks;
} WKContextHistoryClientV0;
-enum { kWKContextHistoryClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKContextHistoryClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKContextDidNavigateWithNavigationDataCallback didNavigateWithNavigationData;
- WKContextDidPerformClientRedirectCallback didPerformClientRedirect;
- WKContextDidPerformServerRedirectCallback didPerformServerRedirect;
- WKContextDidUpdateHistoryTitleCallback didUpdateHistoryTitle;
- WKContextPopulateVisitedLinksCallback populateVisitedLinks;
-} WKContextHistoryClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKContextHistoryClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -57,17 +57,4 @@
WKContextGetInjectedBundleInitializationUserDataCallback getInjectedBundleInitializationUserData;
} WKContextInjectedBundleClientV1;
-enum { kWKContextInjectedBundleClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKContextInjectedBundleClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKContextDidReceiveMessageFromInjectedBundleCallback didReceiveMessageFromInjectedBundle;
- WKContextDidReceiveSynchronousMessageFromInjectedBundleCallback didReceiveSynchronousMessageFromInjectedBundle;
-
- // Version 1.
- WKContextGetInjectedBundleInitializationUserDataCallback getInjectedBundleInitializationUserData;
-} WKContextInjectedBundleClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKContextInjectedBundleClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -55,15 +55,6 @@
WKCookieManagerCookiesDidChangeCallback cookiesDidChange;
} WKCookieManagerClientV0;
-enum { kWKCookieManagerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKCookieManagerClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKCookieManagerCookiesDidChangeCallback cookiesDidChange;
-} WKCookieManagerClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
WK_EXPORT WKTypeID WKCookieManagerGetTypeID();
WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClientBase* client);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -85,16 +85,6 @@
WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase;
} WKDatabaseManagerClientV0;
-enum { kWKDatabaseManagerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKDatabaseManagerClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKDatabaseManagerDidModifyOriginCallback didModifyOrigin;
- WKDatabaseManagerDidModifyDatabaseCallback didModifyDatabase;
-} WKDatabaseManagerClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
WK_EXPORT WKTypeID WKDatabaseManagerGetTypeID();
WK_EXPORT void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManager, const WKDatabaseManagerClientBase* client);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -61,18 +61,7 @@
WKGeolocationProviderSetEnableHighAccuracyCallback setEnableHighAccuracy;
} WKGeolocationProviderV1;
-enum { kWKGeolocationProviderCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKGeolocationProvider {
- int version;
- const void * clientInfo;
- WKGeolocationProviderStartUpdatingCallback startUpdating;
- WKGeolocationProviderStopUpdatingCallback stopUpdating;
- // Version 1.
- WKGeolocationProviderSetEnableHighAccuracyCallback setEnableHighAccuracy;
-} WKGeolocationProvider WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
-
WK_EXPORT WKTypeID WKGeolocationManagerGetTypeID();
WK_EXPORT void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManager, const WKGeolocationProviderBase* provider);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -61,19 +61,6 @@
WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL;
} WKIconDatabaseClientV1;
-enum { kWKIconDatabaseClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKIconDatabaseClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKIconDatabaseDidChangeIconForPageURLCallback didChangeIconForPageURL;
- WKIconDatabaseDidRemoveAllIconsCallback didRemoveAllIcons;
-
- // Version 1.
- WKIconDatabaseIconDataReadyForPageURLCallback iconDataReadyForPageURL;
-} WKIconDatabaseClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
WK_EXPORT WKTypeID WKIconDatabaseGetTypeID();
WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClientBase* client);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -58,21 +58,6 @@
WKNotificationProviderClearNotificationsCallback clearNotifications;
} WKNotificationProviderV0;
-enum { kWKNotificationProviderCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0, };
-typedef struct WKNotificationProvider {
- int version;
- const void* clientInfo;
-
- // Version 0.
- WKNotificationProviderShowCallback show;
- WKNotificationProviderCancelCallback cancel;
- WKNotificationProviderDidDestroyNotificationCallback didDestroyNotification;
- WKNotificationProviderAddNotificationManagerCallback addNotificationManager;
- WKNotificationProviderRemoveNotificationManagerCallback removeNotificationManager;
- WKNotificationProviderNotificationPermissionsCallback notificationPermissions;
- WKNotificationProviderClearNotificationsCallback clearNotifications;
-} WKNotificationProvider WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -98,26 +98,6 @@
WKPageHideContextMenuCallback hideContextMenu;
} WKPageContextMenuClientV3;
-enum { kWKPageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 };
-typedef struct WKPageContextMenuClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKPageGetContextMenuFromProposedContextMenuCallback_deprecatedForUseWithV0 getContextMenuFromProposedMenu_deprecatedForUseWithV0;
- WKPageCustomContextMenuItemSelectedCallback customContextMenuItemSelected;
-
- // Version 1.
- WKPageContextMenuDismissedCallback contextMenuDismissed;
-
- // Version 2.
- WKPageGetContextMenuFromProposedContextMenuCallback getContextMenuFromProposedMenu;
-
- // Version 3.
- WKPageShowContextMenuCallback showContextMenu;
- WKPageHideContextMenuCallback hideContextMenu;
-} WKPageContextMenuClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageDiagnosticLoggingClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageDiagnosticLoggingClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageDiagnosticLoggingClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -51,17 +51,6 @@
WKPageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
} WKPageDiagnosticLoggingClientV0;
-enum { kWKPageDiagnosticLoggingClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKPageDiagnosticLoggingClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKPageLogDiagnosticMessageCallback logDiagnosticMessage;
- WKPageLogDiagnosticMessageWithResultCallback logDiagnosticMessageWithResult;
- WKPageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
-} WKPageDiagnosticLoggingClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFindClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -50,17 +50,6 @@
WKPageDidCountStringMatchesCallback didCountStringMatches;
} WKPageFindClientV0;
-enum { kWKPageFindClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKPageFindClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKPageDidFindStringCallback didFindString;
- WKPageDidFailToFindStringCallback didFailToFindString;
- WKPageDidCountStringMatchesCallback didCountStringMatches;
-} WKPageFindClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFindMatchesClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -53,14 +53,6 @@
WKPageDidGetImageForMatchResultCallback didGetImageForMatchResult;
} WKPageFindMatchesClientV0;
-enum { kWKPageFindMatchesClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKPageFindMatchesClient {
- int version;
- const void * clientInfo;
- WKPageDidFindStringMatchesCallback didFindStringMatches;
- WKPageDidGetImageForMatchResultCallback didGetImageForMatchResult;
-} WKPageFindMatchesClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageFormClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -47,15 +47,6 @@
WKPageWillSubmitFormCallback willSubmitForm;
} WKPageFormClientV0;
-enum { kWKPageFormClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKPageFormClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKPageWillSubmitFormCallback willSubmitForm;
-} WKPageFormClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -462,65 +462,6 @@
WKPageNavigationGestureDidEndCallback navigationGestureDidEnd;
} WKPageLoaderClientV6;
-// FIXME: These should be deprecated.
-enum { kWKPageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 3 };
-typedef struct WKPageLoaderClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKPageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame;
- WKPageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame;
- WKPageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame;
- WKPageDidCommitLoadForFrameCallback didCommitLoadForFrame;
- WKPageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame;
- WKPageDidFinishLoadForFrameCallback didFinishLoadForFrame;
- WKPageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame;
- WKPageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame;
- WKPageDidReceiveTitleForFrameCallback didReceiveTitleForFrame;
- WKPageDidFirstLayoutForFrameCallback didFirstLayoutForFrame;
- WKPageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame;
- WKPageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy;
- WKPageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame;
- WKPageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame;
- WKPageCanAuthenticateAgainstProtectionSpaceInFrameCallback canAuthenticateAgainstProtectionSpaceInFrame;
- WKPageDidReceiveAuthenticationChallengeInFrameCallback didReceiveAuthenticationChallengeInFrame;
-
- // FIXME: Move to progress client.
- WKPageLoaderClientCallback didStartProgress;
- WKPageLoaderClientCallback didChangeProgress;
- WKPageLoaderClientCallback didFinishProgress;
-
- // FIXME: These three functions should not be part of this client.
- WKPageLoaderClientCallback processDidBecomeUnresponsive;
- WKPageLoaderClientCallback processDidBecomeResponsive;
- WKPageLoaderClientCallback processDidCrash;
- WKPageDidChangeBackForwardListCallback didChangeBackForwardList;
- WKPageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem;
- WKPageDidFailToInitializePluginCallback_deprecatedForUseWithV0 didFailToInitializePlugin_deprecatedForUseWithV0;
-
- // Version 1.
- WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame;
-
- void* didNewFirstVisuallyNonEmptyLayout_unavailable;
-
- WKPageWillGoToBackForwardListItemCallback willGoToBackForwardListItem;
-
- WKPageLoaderClientCallback interactionOccurredWhileProcessUnresponsive;
- WKPagePluginDidFailCallback_deprecatedForUseWithV1 pluginDidFail_deprecatedForUseWithV1;
-
- // Version 2.
- void (*didReceiveIntentForFrame_unavailable)(void);
- void (*registerIntentServiceForFrame_unavailable)(void);
-
- WKPageDidLayoutCallback didLayout;
- WKPagePluginLoadPolicyCallback_deprecatedForUseWithV2 pluginLoadPolicy_deprecatedForUseWithV2;
- WKPagePluginDidFailCallback pluginDidFail;
-
- // Version 3.
- WKPagePluginLoadPolicyCallback pluginLoadPolicy;
-} WKPageLoaderClient;
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -71,23 +71,6 @@
WKPageDecidePolicyForResponseCallback decidePolicyForResponse;
} WKPagePolicyClientV1;
-// FIXME: These should be deprecated.
-enum { kWKPagePolicyClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKPagePolicyClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKPageDecidePolicyForNavigationActionCallback_deprecatedForUseWithV0 decidePolicyForNavigationAction_deprecatedForUseWithV0;
- WKPageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction;
- WKPageDecidePolicyForResponseCallback_deprecatedForUseWithV0 decidePolicyForResponse_deprecatedForUseWithV0;
- WKPageUnableToImplementPolicyCallback unableToImplementPolicy;
-
- // Version 1.
- WKPageDecidePolicyForNavigationActionCallback decidePolicyForNavigationAction;
- WKPageDecidePolicyForResponseCallback decidePolicyForResponse;
-} WKPagePolicyClient;
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (188278 => 188279)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -456,64 +456,6 @@
WKPageMediaSessionMetadataDidChangeCallback mediaSessionMetadataDidChange;
} WKPageUIClientV5;
-enum { kWKPageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
-typedef struct WKPageUIClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKPageCreateNewPageCallback_deprecatedForUseWithV0 createNewPage_deprecatedForUseWithV0;
- WKPageUIClientCallback showPage;
- WKPageUIClientCallback close;
- WKPageTakeFocusCallback takeFocus;
- WKPageFocusCallback focus;
- WKPageUnfocusCallback unfocus;
- WKPageRunJavaScriptAlertCallback_deprecatedForUseWithV0 runJavaScriptAlert;
- WKPageRunJavaScriptConfirmCallback_deprecatedForUseWithV0 runJavaScriptConfirm;
- WKPageRunJavaScriptPromptCallback_deprecatedForUseWithV0 runJavaScriptPrompt;
- WKPageSetStatusTextCallback setStatusText;
- WKPageMouseDidMoveOverElementCallback_deprecatedForUseWithV0 mouseDidMoveOverElement_deprecatedForUseWithV0;
- WKPageMissingPluginButtonClickedCallback_deprecatedForUseWithV0 missingPluginButtonClicked_deprecatedForUseWithV0;
- WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent;
- WKPageDidNotHandleWheelEventCallback didNotHandleWheelEvent;
- WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible;
- WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible;
- WKPageGetMenuBarIsVisibleCallback menuBarIsVisible;
- WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible;
- WKPageGetStatusBarIsVisibleCallback statusBarIsVisible;
- WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible;
- WKPageGetIsResizableCallback isResizable;
- WKPageSetIsResizableCallback setIsResizable;
- WKPageGetWindowFrameCallback getWindowFrame;
- WKPageSetWindowFrameCallback setWindowFrame;
- WKPageRunBeforeUnloadConfirmPanelCallback runBeforeUnloadConfirmPanel;
- WKPageUIClientCallback didDraw;
- WKPageUIClientCallback pageDidScroll;
- WKPageExceededDatabaseQuotaCallback exceededDatabaseQuota;
- WKPageRunOpenPanelCallback runOpenPanel;
- WKPageDecidePolicyForGeolocationPermissionRequestCallback decidePolicyForGeolocationPermissionRequest;
- WKPageHeaderHeightCallback headerHeight;
- WKPageFooterHeightCallback footerHeight;
- WKPageDrawHeaderCallback drawHeader;
- WKPageDrawFooterCallback drawFooter;
- WKPagePrintFrameCallback printFrame;
- WKPageUIClientCallback runModal;
- void* unused1; // Used to be didCompleteRubberBandForMainFrame
- WKPageSaveDataToFileInDownloadsFolderCallback saveDataToFileInDownloadsFolder;
- void* shouldInterruptJavaScript_unavailable;
-
- // Version 1.
- WKPageCreateNewPageCallback createNewPage;
- WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
- WKPageDecidePolicyForNotificationPermissionRequestCallback decidePolicyForNotificationPermissionRequest;
- WKPageUnavailablePluginButtonClickedCallback_deprecatedForUseWithV1 unavailablePluginButtonClicked_deprecatedForUseWithV1;
-
- // Version 2.
- WKPageShowColorPickerCallback showColorPicker;
- WKPageHideColorPickerCallback hideColorPicker;
- WKPageUnavailablePluginButtonClickedCallback unavailablePluginButtonClicked;
-} WKPageUIClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -68,21 +68,6 @@
WKBundleDidReceiveMessageToPageCallback didReceiveMessageToPage;
} WKBundleClientV1;
-enum { kWKBundleClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKBundleClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundleDidCreatePageCallback didCreatePage;
- WKBundleWillDestroyPageCallback willDestroyPage;
- WKBundleDidInitializePageGroupCallback didInitializePageGroup;
- WKBundleDidReceiveMessageCallback didReceiveMessage;
-
- // Version 1.
- WKBundleDidReceiveMessageToPageCallback didReceiveMessageToPage;
-} WKBundleClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
WK_EXPORT WKTypeID WKBundleGetTypeID();
WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClientBase* client);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageBanner.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -59,19 +59,6 @@
WKBundlePageBannerMouseDraggedCallback mouseDragged;
} WKBundlePageBannerClientV0;
-enum { kWKBundlePageBannerClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKBundlePageBannerClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageBannerMouseDownCallback mouseDown;
- WKBundlePageBannerMouseUpCallback mouseUp;
- WKBundlePageBannerMouseMovedCallback mouseMoved;
- WKBundlePageBannerMouseDraggedCallback mouseDragged;
-} WKBundlePageBannerClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
-
WK_EXPORT WKTypeID WKBundlePageBannerGetTypeID();
#ifdef __cplusplus
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageContextMenuClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -51,13 +51,4 @@
WKBundlePagePrepareForActionMenuCallback prepareForActionMenu;
} WKBundlePageContextMenuClientV1;
-enum { kWKBundlePageContextMenuClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKBundlePageContextMenuClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageGetContextMenuFromDefaultContextMenuCallback getContextMenuFromDefaultMenu;
-} WKBundlePageContextMenuClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageContextMenuClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -58,18 +58,4 @@
WKBundlePageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
} WKBundlePageDiagnosticLoggingClientV1;
-enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKBundlePageDiagnosticLoggingClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageDiagnosticLoggingCallback logDiagnosticMessageDeprecated;
-
- // Version 1.
- WKBundlePageLogDiagnosticMessageCallback logDiagnosticMessage;
- WKBundlePageLogDiagnosticMessageWithResultCallback logDiagnosticMessageWithResult;
- WKBundlePageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
-} WKBundlePageDiagnosticLoggingClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageDiagnosticLoggingClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageEditorClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -114,28 +114,4 @@
WKBundlePageDidWriteToPasteboard didWriteToPasteboard;
} WKBundlePageEditorClientV1;
-enum { kWKBundlePageEditorClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKBundlePageEditorClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageShouldBeginEditingCallback shouldBeginEditing;
- WKBundlePageShouldEndEditingCallback shouldEndEditing;
- WKBundlePageShouldInsertNodeCallback shouldInsertNode;
- WKBundlePageShouldInsertTextCallback shouldInsertText;
- WKBundlePageShouldDeleteRangeCallback shouldDeleteRange;
- WKBundlePageShouldChangeSelectedRange shouldChangeSelectedRange;
- WKBundlePageShouldApplyStyle shouldApplyStyle;
- WKBundlePageEditingNotification didBeginEditing;
- WKBundlePageEditingNotification didEndEditing;
- WKBundlePageEditingNotification didChange;
- WKBundlePageEditingNotification didChangeSelection;
-
- // Version 1.
- WKBundlePageWillWriteToPasteboard willWriteToPasteboard;
- WKBundlePageGetPasteboardDataForRange getPasteboardDataForRange;
- WKBundlePageDidWriteToPasteboard didWriteToPasteboard;
-} WKBundlePageEditorClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageEditorClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFormClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -92,26 +92,4 @@
WKBundlePageDidAssociateFormControlsCallback didAssociateFormControls;
} WKBundlePageFormClientV2;
-enum { kWKBundlePageFormClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
-typedef struct WKBundlePageFormClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageTextFieldDidBeginEditingCallback textFieldDidBeginEditing;
- WKBundlePageTextFieldDidEndEditingCallback textFieldDidEndEditing;
- WKBundlePageTextDidChangeInTextFieldCallback textDidChangeInTextField;
- WKBundlePageTextDidChangeInTextAreaCallback textDidChangeInTextArea;
- WKBundlePageShouldPerformActionInTextFieldCallback shouldPerformActionInTextField;
- WKBundlePageWillSubmitFormCallback willSubmitForm;
-
- // Version 1.
- WKBundlePageWillSendSubmitEventCallback willSendSubmitEvent;
-
- // version 2.
- WKBundlePageDidFocusTextFieldCallback didFocusTextField;
- WKBundlePageShouldNotifyOnFormChangesCallback shouldNotifyOnFormChanges;
- WKBundlePageDidAssociateFormControlsCallback didAssociateFormControls;
-} WKBundlePageFormClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageFormClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageFullScreenClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -64,20 +64,4 @@
WKBundlePageCloseFullScreen closeFullScreen;
} WKBundlePageFullScreenClientV1;
-enum { kWKBundlePageFullScreenClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKBundlePageFullScreenClient {
- int version;
- const void * clientInfo;
-
- // Version 0:
- WKBundlePageSupportsFullScreen supportsFullScreen;
- WKBundlePageEnterFullScreenForElement enterFullScreenForElement;
- WKBundlePageExitFullScreenForElement exitFullScreenForElement;
-
- // Version 1:
- WKBundlePageBeganEnterFullScreen beganEnterFullScreen;
- WKBundlePageBeganExitFullScreen beganExitFullScreen;
- WKBundlePageCloseFullScreen closeFullScreen;
-} WKBundlePageFullScreenClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageFullScreenClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageLoaderClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -464,61 +464,4 @@
WKBundlePageUserAgentForURLCallback userAgentForURL;
} WKBundlePageLoaderClientV8;
-enum { kWKBundlePageLoaderClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 8 };
-typedef struct WKBundlePageLoaderClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageDidStartProvisionalLoadForFrameCallback didStartProvisionalLoadForFrame;
- WKBundlePageDidReceiveServerRedirectForProvisionalLoadForFrameCallback didReceiveServerRedirectForProvisionalLoadForFrame;
- WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback didFailProvisionalLoadWithErrorForFrame;
- WKBundlePageDidCommitLoadForFrameCallback didCommitLoadForFrame;
- WKBundlePageDidFinishDocumentLoadForFrameCallback didFinishDocumentLoadForFrame;
- WKBundlePageDidFinishLoadForFrameCallback didFinishLoadForFrame;
- WKBundlePageDidFailLoadWithErrorForFrameCallback didFailLoadWithErrorForFrame;
- WKBundlePageDidSameDocumentNavigationForFrameCallback didSameDocumentNavigationForFrame;
- WKBundlePageDidReceiveTitleForFrameCallback didReceiveTitleForFrame;
- WKBundlePageDidFirstLayoutForFrameCallback didFirstLayoutForFrame;
- WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback didFirstVisuallyNonEmptyLayoutForFrame;
- WKBundlePageDidRemoveFrameFromHierarchyCallback didRemoveFrameFromHierarchy;
- WKBundlePageDidDisplayInsecureContentForFrameCallback didDisplayInsecureContentForFrame;
- WKBundlePageDidRunInsecureContentForFrameCallback didRunInsecureContentForFrame;
- WKBundlePageDidClearWindowObjectForFrameCallback didClearWindowObjectForFrame;
- WKBundlePageDidCancelClientRedirectForFrameCallback didCancelClientRedirectForFrame;
- WKBundlePageWillPerformClientRedirectForFrameCallback willPerformClientRedirectForFrame;
- WKBundlePageDidHandleOnloadEventsForFrameCallback didHandleOnloadEventsForFrame;
-
- // Version 1.
- WKBundlePageDidLayoutForFrameCallback didLayoutForFrame;
- void * didNewFirstVisuallyNonEmptyLayout_unavailable;
- WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame;
- WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem;
- WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame;
- WKBundlePageWillDisconnectDOMWindowExtensionFromGlobalObjectCallback willDisconnectDOMWindowExtensionFromGlobalObject;
- WKBundlePageDidReconnectDOMWindowExtensionToGlobalObjectCallback didReconnectDOMWindowExtensionToGlobalObject;
- WKBundlePageWillDestroyGlobalObjectForDOMWindowExtensionCallback willDestroyGlobalObjectForDOMWindowExtension;
-
- // Version 2
- WKBundlePageDidFinishProgressCallback didFinishProgress;
- WKBundlePageShouldForceUniversalAccessFromLocalURLCallback shouldForceUniversalAccessFromLocalURL;
-
- // Version 3
- void * didReceiveIntentForFrame_unavailable;
- void * registerIntentServiceForFrame_unavailable;
-
- // Version 4
- WKBundlePageDidLayoutCallback didLayout;
-
- // Version 5
- WKBundlePageFeaturesUsedInPageCallback featuresUsedInPage;
-
- // Version 6
- WKBundlePageWillLoadURLRequestCallback willLoadURLRequest;
- WKBundlePageWillLoadDataRequestCallback willLoadDataRequest;
-
- // Version 7
- void * willDestroyFrame_unavailable;
-} WKBundlePageLoaderClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageLoaderClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -88,20 +88,6 @@
WKBundlePageOverlayDataDetectorsDidHideUI dataDetectorsDidHideUI;
} WKBundlePageOverlayClientV1;
-enum { kWKBundlePageOverlayClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKBundlePageOverlayClient {
- int version;
- const void * clientInfo;
-
- WKBundlePageOverlayWillMoveToPageCallback willMoveToPage;
- WKBundlePageOverlayDidMoveToPageCallback didMoveToPage;
- WKBundlePageOverlayDrawRectCallback drawRect;
- WKBundlePageOverlayMouseDownCallback mouseDown;
- WKBundlePageOverlayMouseUpCallback mouseUp;
- WKBundlePageOverlayMouseMovedCallback mouseMoved;
- WKBundlePageOverlayMouseDraggedCallback mouseDragged;
-} WKBundlePageOverlayClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
typedef WKTypeRef (*WKAccessibilityAttributeValueCallback)(WKBundlePageOverlayRef pageOverlay, WKStringRef attribute, WKTypeRef parameter, const void* clientInfo);
typedef WKArrayRef (*WKAccessibilityAttributeNamesCallback)(WKBundlePageOverlayRef pageOverlay, bool parameterizedNames, const void* clientInfo);
@@ -118,16 +104,6 @@
WKAccessibilityAttributeNamesCallback copyAccessibilityAttributeNames;
} WKBundlePageOverlayAccessibilityClientV0;
-enum { kWKBundlePageOverlayAccessibilityClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKBundlePageOverlayAccessibilityClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKAccessibilityAttributeValueCallback copyAccessibilityAttributeValue;
- WKAccessibilityAttributeNamesCallback copyAccessibilityAttributeNames;
-} WKBundlePageOverlayAccessibilityClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
WK_EXPORT WKTypeID WKBundlePageOverlayGetTypeID();
WK_EXPORT WKBundlePageOverlayRef WKBundlePageOverlayCreate(WKBundlePageOverlayClientBase* client);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePolicyClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -54,16 +54,4 @@
WKBundlePageUnableToImplementPolicyCallback unableToImplementPolicy;
} WKBundlePagePolicyClientV0;
-enum { kWKBundlePagePolicyClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0 };
-typedef struct WKBundlePagePolicyClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageDecidePolicyForNavigationActionCallback decidePolicyForNavigationAction;
- WKBundlePageDecidePolicyForNewWindowActionCallback decidePolicyForNewWindowAction;
- WKBundlePageDecidePolicyForResponseCallback decidePolicyForResponse;
- WKBundlePageUnableToImplementPolicyCallback unableToImplementPolicy;
-} WKBundlePagePolicyClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePagePolicyClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageResourceLoadClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -76,25 +76,4 @@
WKBundlePageShouldUseCredentialStorageCallback shouldUseCredentialStorage;
} WKBundlePageResourceLoadClientV1;
-enum { kWKBundlePageResourceLoadClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKBundlePageResourceLoadClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageDidInitiateLoadForResourceCallback didInitiateLoadForResource;
-
- // willSendRequestForFrame is supposed to return a retained reference to the URL request.
- WKBundlePageWillSendRequestForFrameCallback willSendRequestForFrame;
-
- WKBundlePageDidReceiveResponseForResourceCallback didReceiveResponseForResource;
- WKBundlePageDidReceiveContentLengthForResourceCallback didReceiveContentLengthForResource;
- WKBundlePageDidFinishLoadForResourceCallback didFinishLoadForResource;
- WKBundlePageDidFailLoadForResourceCallback didFailLoadForResource;
-
- // Version 1.
- WKBundlePageShouldCacheResponseCallback shouldCacheResponse;
- WKBundlePageShouldUseCredentialStorageCallback shouldUseCredentialStorage;
-} WKBundlePageResourceLoadClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageResourceLoadClient_h
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h (188278 => 188279)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2015-08-11 19:47:06 UTC (rev 188278)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageUIClient.h 2015-08-11 19:48:50 UTC (rev 188279)
@@ -174,36 +174,4 @@
WKBundlePageDidClickAutoFillButtonCallback didClickAutoFillButton;
} WKBundlePageUIClientV3;
-enum { kWKBundlePageUIClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 2 };
-typedef struct WKBundlePageUIClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageWillAddMessageToConsoleCallback willAddMessageToConsole;
- WKBundlePageWillSetStatusbarTextCallback willSetStatusbarText;
- WKBundlePageWillRunJavaScriptAlertCallback willRunJavaScriptAlert;
- WKBundlePageWillRunJavaScriptConfirmCallback willRunJavaScriptConfirm;
- WKBundlePageWillRunJavaScriptPromptCallback willRunJavaScriptPrompt;
- WKBundlePageMouseDidMoveOverElementCallback mouseDidMoveOverElement;
- WKBundlePageDidScrollCallback pageDidScroll;
- void* unused1;
- WKBundlePageGenerateFileForUploadCallback shouldGenerateFileForUpload;
- WKBundlePageGenerateFileForUploadCallback generateFileForUpload;
- void* unused2;
- WKBundlePageStatusBarIsVisibleCallback statusBarIsVisible;
- WKBundlePageMenuBarIsVisibleCallback menuBarIsVisible;
- WKBundlePageToolbarsAreVisibleCallback toolbarsAreVisible;
-
- // Version 1.
- WKBundlePageReachedAppCacheOriginQuotaCallback didReachApplicationCacheOriginQuota;
-
- // Version 2.
- WKBundlePageExceededDatabaseQuotaCallback didExceedDatabaseQuota;
- WKBundlePagePlugInCreateStartLabelTitleCallback createPlugInStartLabelTitle;
- WKBundlePagePlugInCreateStartLabelSubtitleCallback createPlugInStartLabelSubtitle;
- WKBundlePagePlugInCreateExtraStyleSheetCallback createPlugInExtraStyleSheet;
- WKBundlePagePlugInCreateExtraScriptCallback createPlugInExtraScript;
-} WKBundlePageUIClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
#endif // WKBundlePageUIClient_h
