Changeset 159984 in webkit
- Timestamp:
- Dec 2, 2013 5:11:47 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r159983 r159984 1 2013-12-02 Anders Carlsson <andersca@apple.com> 2 3 Add versioned structs for the remaining clients 4 https://bugs.webkit.org/show_bug.cgi?id=125123 5 6 Reviewed by Andreas Kling. 7 8 * UIProcess/API/C/WKContext.h: 9 * UIProcess/API/C/WKContextConnectionClient.h: 10 * UIProcess/API/C/WKContextDownloadClient.h: 11 * UIProcess/API/C/WKContextHistoryClient.h: 12 * UIProcess/API/C/WKContextInjectedBundleClient.h: 13 * UIProcess/API/C/WKOriginDataManager.h: 14 1 15 2013-12-02 Anders Carlsson <andersca@apple.com> 2 16 -
trunk/Source/WebKit2/UIProcess/API/C/WKContext.h
r159983 r159984 49 49 typedef void (*WKContextPlugInInformationBecameAvailableCallback)(WKContextRef context, WKArrayRef plugIn, const void *clientInfo); 50 50 51 struct WKContextClient { 51 typedef struct WKContextClientBase { 52 int version; 53 const void * clientInfo; 54 } WKContextClientBase; 55 56 typedef struct WKContextClientV0 { 57 WKContextClientBase base; 58 59 // Version 0. 60 WKContextPlugInAutoStartOriginHashesChangedCallback plugInAutoStartOriginHashesChanged; 61 WKContextNetworkProcessDidCrashCallback networkProcessDidCrash; 62 WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable; 63 } WKContextClientV0; 64 65 // FIXME: Deprecate. 66 enum { kWKContextClientCurrentVersion = 0 }; 67 typedef struct WKContextClient { 52 68 int version; 53 69 const void * clientInfo; … … 57 73 WKContextNetworkProcessDidCrashCallback networkProcessDidCrash; 58 74 WKContextPlugInInformationBecameAvailableCallback plugInInformationBecameAvailable; 59 }; 60 typedef struct WKContextClient WKContextClient; 61 62 enum { kWKContextClientCurrentVersion = 0 }; 75 } WKContextClient; 63 76 64 77 enum { -
trunk/Source/WebKit2/UIProcess/API/C/WKContextConnectionClient.h
r159983 r159984 31 31 typedef void (*WKContextDidCreateConnection)(WKContextRef context, WKConnectionRef connection, const void* clientInfo); 32 32 33 struct WKContextConnectionClient{33 typedef struct WKContextConnectionClientBase { 34 34 int version; 35 35 const void * clientInfo; 36 } WKContextConnectionClientBase; 37 38 typedef struct WKContextConnectionClientV0 { 39 WKContextConnectionClientBase base; 40 41 // Version 0. 36 42 WKContextDidCreateConnection didCreateConnection; 37 }; 38 typedef struct WKContextConnectionClient WKContextConnectionClient; 43 } WKContextConnectionClientV0; 39 44 45 // FIXME: Deprecate. 40 46 enum { kWKContextConnectionClientCurrentVersion = 0 }; 47 typedef struct WKContextConnectionClient { 48 int version; 49 const void * clientInfo; 41 50 51 // Version 0. 52 WKContextDidCreateConnection didCreateConnection; 53 } WKContextConnectionClient; 42 54 43 55 #endif // WKContextConnectionClient_h -
trunk/Source/WebKit2/UIProcess/API/C/WKContextDownloadClient.h
r159983 r159984 41 41 typedef void (*WKContextDownloadProcessDidCrashCallback)(WKContextRef context, WKDownloadRef download, const void *clientInfo); 42 42 43 struct WKContextDownloadClient{43 typedef struct WKContextDownloadClientBase { 44 44 int version; 45 45 const void * clientInfo; 46 } WKContextDownloadClientBase; 47 48 typedef struct WKContextDownloadClientV0 { 49 WKContextDownloadClientBase base; 50 51 // Version 0. 46 52 WKContextDownloadDidStartCallback didStart; 47 53 WKContextDownloadDidReceiveAuthenticationChallengeCallback didReceiveAuthenticationChallenge; … … 55 61 WKContextDownloadDidCancel didCancel; 56 62 WKContextDownloadProcessDidCrashCallback processDidCrash; 57 }; 58 typedef struct WKContextDownloadClient WKContextDownloadClient; 63 } WKContextDownloadClientV0; 59 64 65 // FIXME: Deprecate. 60 66 enum { kWKContextDownloadClientCurrentVersion = 0 }; 67 typedef struct WKContextDownloadClient { 68 int version; 69 const void * clientInfo; 70 71 // Version 0. 72 WKContextDownloadDidStartCallback didStart; 73 WKContextDownloadDidReceiveAuthenticationChallengeCallback didReceiveAuthenticationChallenge; 74 WKContextDownloadDidReceiveResponseCallback didReceiveResponse; 75 WKContextDownloadDidReceiveDataCallback didReceiveData; 76 WKContextDownloadShouldDecodeSourceDataOfMIMETypeCallback shouldDecodeSourceDataOfMIMEType; 77 WKContextDownloadDecideDestinationWithSuggestedFilenameCallback decideDestinationWithSuggestedFilename; 78 WKContextDownloadDidCreateDestinationCallback didCreateDestination; 79 WKContextDownloadDidFinishCallback didFinish; 80 WKContextDownloadDidFailCallback didFail; 81 WKContextDownloadDidCancel didCancel; 82 WKContextDownloadProcessDidCrashCallback processDidCrash; 83 } WKContextDownloadClient; 61 84 62 85 #endif // WKContextDownloadClient_h -
trunk/Source/WebKit2/UIProcess/API/C/WKContextHistoryClient.h
r159983 r159984 35 35 typedef void (*WKContextPopulateVisitedLinksCallback)(WKContextRef context, const void *clientInfo); 36 36 37 struct WKContextHistoryClient{37 typedef struct WKContextHistoryClientBase { 38 38 int version; 39 39 const void * clientInfo; 40 } WKContextHistoryClientBase; 41 42 typedef struct WKContextHistoryClientV0 { 43 WKContextHistoryClientBase base; 44 45 // Version 0. 40 46 WKContextDidNavigateWithNavigationDataCallback didNavigateWithNavigationData; 41 47 WKContextDidPerformClientRedirectCallback didPerformClientRedirect; … … 43 49 WKContextDidUpdateHistoryTitleCallback didUpdateHistoryTitle; 44 50 WKContextPopulateVisitedLinksCallback populateVisitedLinks; 45 }; 46 typedef struct WKContextHistoryClient WKContextHistoryClient; 51 } WKContextHistoryClientV0; 47 52 53 // FIXME: Deprecate. 48 54 enum { kWKContextHistoryClientCurrentVersion = 0 }; 55 typedef struct WKContextHistoryClient { 56 int version; 57 const void * clientInfo; 58 59 // Version 0. 60 WKContextDidNavigateWithNavigationDataCallback didNavigateWithNavigationData; 61 WKContextDidPerformClientRedirectCallback didPerformClientRedirect; 62 WKContextDidPerformServerRedirectCallback didPerformServerRedirect; 63 WKContextDidUpdateHistoryTitleCallback didUpdateHistoryTitle; 64 WKContextPopulateVisitedLinksCallback populateVisitedLinks; 65 } WKContextHistoryClient; 49 66 50 67 #endif // WKContextHistoryClient_h -
trunk/Source/WebKit2/UIProcess/API/C/WKContextInjectedBundleClient.h
r159983 r159984 34 34 typedef WKTypeRef (*WKContextGetInjectedBundleInitializationUserDataCallback)(WKContextRef context, const void *clientInfo); 35 35 36 struct WKContextInjectedBundleClient { 36 typedef struct WKContextInjectedBundleClientBase { 37 int version; 38 const void * clientInfo; 39 } WKContextInjectedBundleClientBase; 40 41 typedef struct WKContextInjectedBundleClientV0 { 42 WKContextInjectedBundleClientBase base; 43 44 // Version 0. 45 WKContextDidReceiveMessageFromInjectedBundleCallback didReceiveMessageFromInjectedBundle; 46 WKContextDidReceiveSynchronousMessageFromInjectedBundleCallback didReceiveSynchronousMessageFromInjectedBundle; 47 } WKContextInjectedBundleClientV0; 48 49 typedef struct WKContextInjectedBundleClientV1 { 50 WKContextInjectedBundleClientBase base; 51 52 // Version 0. 53 WKContextDidReceiveMessageFromInjectedBundleCallback didReceiveMessageFromInjectedBundle; 54 WKContextDidReceiveSynchronousMessageFromInjectedBundleCallback didReceiveSynchronousMessageFromInjectedBundle; 55 56 // Version 1. 57 WKContextGetInjectedBundleInitializationUserDataCallback getInjectedBundleInitializationUserData; 58 } WKContextInjectedBundleClientV1; 59 60 typedef struct WKContextInjectedBundleClient { 37 61 int version; 38 62 const void * clientInfo; … … 44 68 // Version 1. 45 69 WKContextGetInjectedBundleInitializationUserDataCallback getInjectedBundleInitializationUserData; 46 }; 47 typedef struct WKContextInjectedBundleClient WKContextInjectedBundleClient; 70 } WKContextInjectedBundleClient; 48 71 49 72 enum { kWKContextInjectedBundleClientCurrentVersion = 1 }; -
trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.h
r157595 r159984 56 56 // OriginDataManager Client 57 57 typedef void (*WKOriginDataManagerChangeCallback)(WKOriginDataManagerRef originDataManager, const void *clientInfo); 58 struct WKOriginDataManagerChangeClient {59 int version;60 const void * clientInfo;61 WKOriginDataManagerChangeCallback didChange;62 };63 typedef struct WKOriginDataManagerChangeClient WKOriginDataManagerChangeClient;64 58 59 typedef struct WKOriginDataManagerChangeClientBase { 60 const void * clientInfo; 61 int version; 62 } WKOriginDataManagerChangeClientBase; 63 64 typedef struct WKOriginDataManagerChangeClientV0 { 65 WKOriginDataManagerChangeClientBase base; 66 67 // Version 0. 68 WKOriginDataManagerChangeCallback didChange; 69 } WKOriginDataManagerChangeClientV0; 70 71 // FIXME: Deprecate. 65 72 enum { kWKOriginDataManagerChangeClientVersion = 0 }; 73 typedef struct WKOriginDataManagerChangeClient { 74 int version; 75 const void * clientInfo; 76 77 // Version 0. 78 WKOriginDataManagerChangeCallback didChange; 79 } WKOriginDataManagerChangeClient; 66 80 67 81 WK_EXPORT void WKOriginDataManagerStartObservingChanges(WKOriginDataManagerRef originDataManager, WKOriginDataTypes types);
Note: See TracChangeset
for help on using the changeset viewer.