Diff
Modified: trunk/Source/WebKit2/ChangeLog (90159 => 90160)
--- trunk/Source/WebKit2/ChangeLog 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-30 21:46:23 UTC (rev 90160)
@@ -1,3 +1,19 @@
+2011-06-30 Mark Rowe <[email protected]>
+
+ Reviewed by Anders Carlsson.
+
+ WebKit2 client interfaces should have constant declaring latest version.
+
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/C/WKCookieManager.h:
+ * UIProcess/API/C/WKDatabaseManager.h:
+ * UIProcess/API/C/WKGeolocationManager.h:
+ * UIProcess/API/C/WKIconDatabase.h:
+ * UIProcess/API/C/WKPage.h:
+ * WebProcess/InjectedBundle/API/c/WKBundle.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h:
+
2011-06-30 Anders Carlsson <[email protected]>
Build fix.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (90159 => 90160)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -51,6 +51,8 @@
};
typedef struct WKContextInjectedBundleClient WKContextInjectedBundleClient;
+enum { kWKContextInjectedBundleClientCurrentVersion = 0 };
+
// History Client
typedef void (*WKContextDidNavigateWithNavigationDataCallback)(WKContextRef context, WKPageRef page, WKNavigationDataRef navigationData, WKFrameRef frame, const void *clientInfo);
typedef void (*WKContextDidPerformClientRedirectCallback)(WKContextRef context, WKPageRef page, WKURLRef sourceURL, WKURLRef destinationURL, WKFrameRef frame, const void *clientInfo);
@@ -69,6 +71,8 @@
};
typedef struct WKContextHistoryClient WKContextHistoryClient;
+enum { kWKContextHistoryClientCurrentVersion = 0 };
+
// Download Client
typedef void (*WKContextDownloadDidStartCallback)(WKContextRef context, WKDownloadRef download, const void *clientInfo);
typedef void (*WKContextDownloadDidReceiveAuthenticationChallengeCallback)(WKContextRef context, WKDownloadRef download, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo);
@@ -99,6 +103,8 @@
};
typedef struct WKContextDownloadClient WKContextDownloadClient;
+enum { kWKContextDownloadClientCurrentVersion = 0 };
+
WK_EXPORT WKTypeID WKContextGetTypeID();
WK_EXPORT WKContextRef WKContextCreate();
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h (90159 => 90160)
--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -49,6 +49,8 @@
};
typedef struct WKCookieManagerClient WKCookieManagerClient;
+enum { kWKCookieManagerClientCurrentVersion = 0 };
+
WK_EXPORT WKTypeID WKCookieManagerGetTypeID();
WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClient* client);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h (90159 => 90160)
--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -74,7 +74,9 @@
};
typedef struct WKDatabaseManagerClient WKDatabaseManagerClient;
+enum { kWKDatabaseManagerClientCurrentVersion = 0 };
+
WK_EXPORT WKTypeID WKDatabaseManagerGetTypeID();
WK_EXPORT void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManager, const WKDatabaseManagerClient* client);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h (90159 => 90160)
--- trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -44,6 +44,8 @@
};
typedef struct WKGeolocationProvider WKGeolocationProvider;
+enum { kWKGeolocationProviderCurrentVersion = 0 };
+
WK_EXPORT WKTypeID WKGeolocationManagerGetTypeID();
WK_EXPORT void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManager, const WKGeolocationProvider* provider);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h (90159 => 90160)
--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -44,6 +44,8 @@
};
typedef struct WKIconDatabaseClient WKIconDatabaseClient;
+enum { kWKIconDatabaseClientCurrentVersion = 0 };
+
WK_EXPORT WKTypeID WKIconDatabaseGetTypeID();
WK_EXPORT void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabase, const WKIconDatabaseClient* client);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (90159 => 90160)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -105,6 +105,8 @@
};
typedef struct WKPageLoaderClient WKPageLoaderClient;
+enum { kWKPageLoaderClientCurrentVersion = 0 };
+
// Policy Client.
typedef void (*WKPageDecidePolicyForNavigationActionCallback)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo);
typedef void (*WKPageDecidePolicyForNewWindowActionCallback)(WKPageRef page, WKFrameRef frame, WKFrameNavigationType navigationType, WKEventModifiers modifiers, WKEventMouseButton mouseButton, WKURLRequestRef request, WKStringRef frameName, WKFramePolicyListenerRef listener, WKTypeRef userData, const void* clientInfo);
@@ -121,6 +123,8 @@
};
typedef struct WKPagePolicyClient WKPagePolicyClient;
+enum { kWKPagePolicyClientCurrentVersion = 0 };
+
// Form Client.
typedef void (*WKPageWillSubmitFormCallback)(WKPageRef page, WKFrameRef frame, WKFrameRef sourceFrame, WKDictionaryRef values, WKTypeRef userData, WKFormSubmissionListenerRef listener, const void* clientInfo);
@@ -131,6 +135,8 @@
};
typedef struct WKPageFormClient WKPageFormClient;
+enum { kWKPageFormClientCurrentVersion = 0 };
+
// Resource Load Client.
typedef void (*WKPageDidInitiateLoadForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, bool pageIsProvisionallyLoading, const void* clientInfo);
typedef void (*WKPageDidSendRequestForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, WKURLResponseRef redirectResponse, const void* clientInfo);
@@ -151,6 +157,8 @@
};
typedef struct WKPageResourceLoadClient WKPageResourceLoadClient;
+enum { kWKPageResourceLoadClientCurrentVersion = 0 };
+
// UI Client
typedef WKPageRef (*WKPageCreateNewPageCallback)(WKPageRef page, WKDictionaryRef features, WKEventModifiers modifiers, WKEventMouseButton mouseButton, const void *clientInfo);
typedef void (*WKPageRunJavaScriptAlertCallback)(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void *clientInfo);
@@ -232,6 +240,8 @@
};
typedef struct WKPageUIClient WKPageUIClient;
+enum { kWKPageUIClientCurrentVersion = 0 };
+
// Find client.
typedef void (*WKPageDidFindStringCallback)(WKPageRef page, WKStringRef string, unsigned matchCount, const void* clientInfo);
typedef void (*WKPageDidFailToFindStringCallback)(WKPageRef page, WKStringRef string, const void* clientInfo);
@@ -246,6 +256,8 @@
};
typedef struct WKPageFindClient WKPageFindClient;
+enum { kWKPageFindClientCurrentVersion = 0 };
+
enum {
kWKMoreThanMaximumMatchCount = -1
};
@@ -262,6 +274,8 @@
};
typedef struct WKPageContextMenuClient WKPageContextMenuClient;
+enum { kWKPageContextMenuClientCurrentVersion = 0 };
+
WK_EXPORT WKTypeID WKPageGetTypeID();
WK_EXPORT WKContextRef WKPageGetContext(WKPageRef page);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h (90159 => 90160)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -49,6 +49,8 @@
};
typedef struct WKBundleClient WKBundleClient;
+enum { kWKBundleClientCurrentVersion = 0 };
+
WK_EXPORT WKTypeID WKBundleGetTypeID();
WK_EXPORT void WKBundleSetClient(WKBundleRef bundle, WKBundleClient * client);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (90159 => 90160)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -125,6 +125,8 @@
};
typedef struct WKBundlePageLoaderClient WKBundlePageLoaderClient;
+enum { kWKBundlePageLoaderClientCurrentVersion = 0 };
+
enum {
WKBundlePagePolicyActionPassThrough,
WKBundlePagePolicyActionUse
@@ -147,6 +149,8 @@
};
typedef struct WKBundlePagePolicyClient WKBundlePagePolicyClient;
+enum { kWKBundlePagePolicyClientCurrentVersion = 0 };
+
// Resource Load Client
typedef void (*WKBundlePageDidInitiateLoadForResourceCallback)(WKBundlePageRef, WKBundleFrameRef, uint64_t resourceIdentifier, WKURLRequestRef, bool pageIsProvisionallyLoading, const void* clientInfo);
typedef WKURLRequestRef (*WKBundlePageWillSendRequestForFrameCallback)(WKBundlePageRef, WKBundleFrameRef, uint64_t resourceIdentifier, WKURLRequestRef, WKURLResponseRef redirectResponse, const void *clientInfo);
@@ -170,6 +174,8 @@
};
typedef struct WKBundlePageResourceLoadClient WKBundlePageResourceLoadClient;
+enum { kWKBundlePageResourceLoadClientCurrentVersion = 0 };
+
enum {
WKBundlePageUIElementVisibilityUnknown,
WKBundlePageUIElementVisible,
@@ -212,6 +218,8 @@
};
typedef struct WKBundlePageUIClient WKBundlePageUIClient;
+enum { kWKBundlePageUIClientCurrentVersion = 0 };
+
// Editor client
typedef bool (*WKBundlePageShouldBeginEditingCallback)(WKBundlePageRef page, WKBundleRangeHandleRef range, const void* clientInfo);
typedef bool (*WKBundlePageShouldEndEditingCallback)(WKBundlePageRef page, WKBundleRangeHandleRef range, const void* clientInfo);
@@ -239,6 +247,8 @@
};
typedef struct WKBundlePageEditorClient WKBundlePageEditorClient;
+enum { kWKBundlePageEditorClientCurrentVersion = 0 };
+
// Form client
typedef void (*WKBundlePageTextFieldDidBeginEditingCallback)(WKBundlePageRef page, WKBundleNodeHandleRef htmlInputElementHandle, WKBundleFrameRef frame, const void* clientInfo);
typedef void (*WKBundlePageTextFieldDidEndEditingCallback)(WKBundlePageRef page, WKBundleNodeHandleRef htmlInputElementHandle, WKBundleFrameRef frame, const void* clientInfo);
@@ -259,6 +269,8 @@
};
typedef struct WKBundlePageFormClient WKBundlePageFormClient;
+enum { kWKBundlePageFormClientCurrentVersion = 0 };
+
// ContextMenu client
typedef void (*WKBundlePageGetContextMenuFromDefaultContextMenuCallback)(WKBundlePageRef page, WKBundleHitTestResultRef hitTestResult, WKArrayRef defaultMenu, WKArrayRef* newMenu, WKTypeRef* userData, const void* clientInfo);
@@ -269,6 +281,8 @@
};
typedef struct WKBundlePageContextMenuClient WKBundlePageContextMenuClient;
+enum { kWKBundlePageContextMenuClientCurrentVersion = 0 };
+
// Full Screen client
typedef bool (*WKBundlePageSupportsFullScreen)(WKBundlePageRef page, WKFullScreenKeyboardRequestType requestType);
typedef void (*WKBundlePageEnterFullScreenForElement)(WKBundlePageRef page, WKBundleNodeHandleRef element);
@@ -283,6 +297,8 @@
};
typedef struct WKBundlePageFullScreenClient WKBundlePageFullScreenClient;
+enum { kWKBundlePageFullScreenClientCurrentVersion = 0 };
+
WK_EXPORT void WKBundlePageWillEnterFullScreen(WKBundlePageRef page);
WK_EXPORT void WKBundlePageDidEnterFullScreen(WKBundlePageRef page);
WK_EXPORT void WKBundlePageWillExitFullScreen(WKBundlePageRef page);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h (90159 => 90160)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2011-06-30 21:41:58 UTC (rev 90159)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageOverlay.h 2011-06-30 21:46:23 UTC (rev 90160)
@@ -61,6 +61,8 @@
WKBundlePageOverlayMouseDraggedCallback mouseDragged;
};
typedef struct WKBundlePageOverlayClient WKBundlePageOverlayClient;
+
+enum { kWKBundlePageOverlayClientCurrentVersion = 0 };
WK_EXPORT WKTypeID WKBundlePageOverlayGetTypeID();
