Diff
Modified: trunk/Source/WebKit2/ChangeLog (90160 => 90161)
--- trunk/Source/WebKit2/ChangeLog 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-30 21:46:31 UTC (rev 90161)
@@ -2,6 +2,39 @@
Reviewed by Anders Carlsson.
+ Make the APIClient template aware of the latest client interface version number.
+
+ This will be used in an upcoming patch.
+
+ * Shared/APIClient.h:
+ * UIProcess/WebContextInjectedBundleClient.h:
+ * UIProcess/WebCookieManagerProxyClient.h:
+ * UIProcess/WebDatabaseManagerProxyClient.h:
+ * UIProcess/WebDownloadClient.h:
+ * UIProcess/WebFindClient.h:
+ * UIProcess/WebFormClient.h:
+ * UIProcess/WebGeolocationProvider.h:
+ * UIProcess/WebHistoryClient.h:
+ * UIProcess/WebIconDatabaseClient.h:
+ * UIProcess/WebLoaderClient.h:
+ * UIProcess/WebPageContextMenuClient.h:
+ * UIProcess/WebPolicyClient.h:
+ * UIProcess/WebResourceLoadClient.h:
+ * UIProcess/WebUIClient.h:
+ * WebProcess/InjectedBundle/InjectedBundleClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageFormClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageUIClient.h:
+
+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:
Modified: trunk/Source/WebKit2/Shared/APIClient.h (90160 => 90161)
--- trunk/Source/WebKit2/Shared/APIClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/Shared/APIClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -28,7 +28,7 @@
namespace WebKit {
-template<typename T> class APIClient {
+template<typename T, int> class APIClient {
public:
APIClient()
{
Modified: trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebContextInjectedBundleClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -35,7 +35,7 @@
class APIObject;
class WebContext;
-class WebContextInjectedBundleClient : public APIClient<WKContextInjectedBundleClient> {
+class WebContextInjectedBundleClient : public APIClient<WKContextInjectedBundleClient, kWKContextInjectedBundleClientCurrentVersion> {
public:
void didReceiveMessageFromInjectedBundle(WebContext*, const String&, APIObject*);
void didReceiveSynchronousMessageFromInjectedBundle(WebContext*, const String&, APIObject*, RefPtr<APIObject>& returnData);
Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxyClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -34,7 +34,7 @@
class WebCookieManagerProxy;
-class WebCookieManagerProxyClient : public APIClient<WKCookieManagerClient> {
+class WebCookieManagerProxyClient : public APIClient<WKCookieManagerClient, kWKCookieManagerClientCurrentVersion> {
public:
void cookiesDidChange(WebCookieManagerProxy*);
};
Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxyClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -35,7 +35,7 @@
class WebDatabaseManagerProxy;
class WebSecurityOrigin;
-class WebDatabaseManagerProxyClient : public APIClient<WKDatabaseManagerClient> {
+class WebDatabaseManagerProxyClient : public APIClient<WKDatabaseManagerClient, kWKDatabaseManagerClientCurrentVersion> {
public:
void didModifyOrigin(WebDatabaseManagerProxy*, WebSecurityOrigin*);
void didModifyDatabase(WebDatabaseManagerProxy*, WebSecurityOrigin*, const String& databaseIdentifier);
Modified: trunk/Source/WebKit2/UIProcess/WebDownloadClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebDownloadClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebDownloadClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -41,7 +41,7 @@
class DownloadProxy;
class WebContext;
-class WebDownloadClient : public APIClient<WKContextDownloadClient> {
+class WebDownloadClient : public APIClient<WKContextDownloadClient, kWKContextDownloadClientCurrentVersion> {
public:
void didStart(WebContext*, DownloadProxy*);
void didReceiveAuthenticationChallenge(WebContext*, DownloadProxy*, AuthenticationChallengeProxy*);
Modified: trunk/Source/WebKit2/UIProcess/WebFindClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebFindClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebFindClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -34,7 +34,7 @@
class WebPageProxy;
-class WebFindClient : public APIClient<WKPageFindClient> {
+class WebFindClient : public APIClient<WKPageFindClient, kWKPageFindClientCurrentVersion> {
public:
void didFindString(WebPageProxy*, const String&, uint32_t matchCount);
void didFailToFindString(WebPageProxy*, const String&);
Modified: trunk/Source/WebKit2/UIProcess/WebFormClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebFormClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebFormClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -39,7 +39,7 @@
class WebFrameProxy;
class WebFormSubmissionListenerProxy;
-class WebFormClient : public APIClient<WKPageFormClient> {
+class WebFormClient : public APIClient<WKPageFormClient, kWKPageFormClientCurrentVersion> {
public:
bool willSubmitForm(WebPageProxy*, WebFrameProxy*, WebFrameProxy*, const Vector<std::pair<String, String> >& textFieldValues, APIObject* userData, WebFormSubmissionListenerProxy*);
};
Modified: trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebGeolocationProvider.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -34,7 +34,7 @@
class WebGeolocationManagerProxy;
-class WebGeolocationProvider : public APIClient<WKGeolocationProvider> {
+class WebGeolocationProvider : public APIClient<WKGeolocationProvider, kWKGeolocationProviderCurrentVersion> {
public:
void startUpdating(WebGeolocationManagerProxy*);
void stopUpdating(WebGeolocationManagerProxy*);
Modified: trunk/Source/WebKit2/UIProcess/WebHistoryClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebHistoryClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebHistoryClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -37,7 +37,7 @@
class WebPageProxy;
struct WebNavigationDataStore;
-class WebHistoryClient : public APIClient<WKContextHistoryClient> {
+class WebHistoryClient : public APIClient<WKContextHistoryClient, kWKContextHistoryClientCurrentVersion> {
public:
void didNavigateWithNavigationData(WebContext*, WebPageProxy*, const WebNavigationDataStore&, WebFrameProxy*);
void didPerformClientRedirect(WebContext*, WebPageProxy*, const String& sourceURL, const String& destinationURL, WebFrameProxy*);
Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabaseClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -35,7 +35,7 @@
class WebIconDatabase;
class WebURL;
-class WebIconDatabaseClient : public APIClient<WKIconDatabaseClient> {
+class WebIconDatabaseClient : public APIClient<WKIconDatabaseClient, kWKIconDatabaseClientCurrentVersion> {
public:
void didChangeIconForPageURL(WebIconDatabase*, WebURL*);
void didRemoveAllIcons(WebIconDatabase*);
Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -47,7 +47,7 @@
class WebPageProxy;
class WebProtectionSpace;
-class WebLoaderClient : public APIClient<WKPageLoaderClient> {
+class WebLoaderClient : public APIClient<WKPageLoaderClient, kWKPageLoaderClientCurrentVersion> {
public:
void didStartProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
Modified: trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebPageContextMenuClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -36,7 +36,7 @@
class WebContextMenuItemData;
class WebPageProxy;
-class WebPageContextMenuClient : public APIClient<WKPageContextMenuClient> {
+class WebPageContextMenuClient : public APIClient<WKPageContextMenuClient, kWKPageContextMenuClientCurrentVersion> {
public:
bool getContextMenuFromProposedMenu(WebPageProxy*, const Vector<WebContextMenuItemData>& proposedMenu, Vector<WebContextMenuItemData>& customMenu, APIObject* userData);
void customContextMenuItemSelected(WebPageProxy*, const WebContextMenuItemData&);
Modified: trunk/Source/WebKit2/UIProcess/WebPolicyClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebPolicyClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebPolicyClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -45,7 +45,7 @@
class WebFrameProxy;
class WebFramePolicyListenerProxy;
-class WebPolicyClient : public APIClient<WKPagePolicyClient> {
+class WebPolicyClient : public APIClient<WKPagePolicyClient, kWKPagePolicyClientCurrentVersion> {
public:
bool decidePolicyForNavigationAction(WebPageProxy*, WebFrameProxy*, WebCore::NavigationType, WebEvent::Modifiers, WebMouseEvent::Button, const WebCore::ResourceRequest&, WebFramePolicyListenerProxy*, APIObject* userData);
bool decidePolicyForNewWindowAction(WebPageProxy*, WebFrameProxy*, WebCore::NavigationType, WebEvent::Modifiers, WebMouseEvent::Button, const WebCore::ResourceRequest&, const String& frameName, WebFramePolicyListenerProxy*, APIObject* userData);
Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -41,7 +41,7 @@
class WebFrameProxy;
class WebPageProxy;
-class WebResourceLoadClient : public APIClient<WKPageResourceLoadClient> {
+class WebResourceLoadClient : public APIClient<WKPageResourceLoadClient, kWKPageResourceLoadClientCurrentVersion> {
public:
void didInitiateLoadForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, bool pageIsProvisionallyLoading);
void didSendRequestForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.h (90160 => 90161)
--- trunk/Source/WebKit2/UIProcess/WebUIClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -51,7 +51,7 @@
class WebSecurityOrigin;
class WebOpenPanelResultListenerProxy;
-class WebUIClient : public APIClient<WKPageUIClient> {
+class WebUIClient : public APIClient<WKPageUIClient, kWKPageUIClientCurrentVersion> {
public:
PassRefPtr<WebPageProxy> createNewPage(WebPageProxy*, const WebCore::WindowFeatures&, WebEvent::Modifiers, WebMouseEvent::Button);
void showPage(WebPageProxy*);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -37,7 +37,7 @@
class WebPage;
class WebPageGroupProxy;
-class InjectedBundleClient : public APIClient<WKBundleClient> {
+class InjectedBundleClient : public APIClient<WKBundleClient, kWKBundleClientCurrentVersion> {
public:
void didCreatePage(InjectedBundle*, WebPage*);
void willDestroyPage(InjectedBundle*, WebPage*);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -41,7 +41,7 @@
class WebContextMenuItemData;
class WebPage;
-class InjectedBundlePageContextMenuClient : public APIClient<WKBundlePageContextMenuClient> {
+class InjectedBundlePageContextMenuClient : public APIClient<WKBundlePageContextMenuClient, kWKBundlePageContextMenuClientCurrentVersion> {
public:
bool getCustomMenuFromDefaultItems(WebPage*, InjectedBundleHitTestResult*, const Vector<WebContextMenuItemData>& defaultMenu, Vector<WebContextMenuItemData>& newMenu, RefPtr<APIObject>& userData);
};
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -43,7 +43,7 @@
class WebFrame;
class WebPage;
-class InjectedBundlePageEditorClient : public APIClient<WKBundlePageEditorClient> {
+class InjectedBundlePageEditorClient : public APIClient<WKBundlePageEditorClient, kWKBundlePageEditorClientCurrentVersion> {
public:
bool shouldBeginEditing(WebPage*, WebCore::Range*);
bool shouldEndEditing(WebPage*, WebCore::Range*);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -45,7 +45,7 @@
class WebFrame;
class WebPage;
-class InjectedBundlePageFormClient : public APIClient<WKBundlePageFormClient> {
+class InjectedBundlePageFormClient : public APIClient<WKBundlePageFormClient, kWKBundlePageFormClientCurrentVersion> {
public:
void textFieldDidBeginEditing(WebPage*, WebCore::HTMLInputElement*, WebFrame*);
void textFieldDidEndEditing(WebPage*, WebCore::HTMLInputElement*, WebFrame*);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -41,7 +41,7 @@
class WebPage;
-class InjectedBundlePageFullScreenClient : public APIClient<WKBundlePageFullScreenClient> {
+class InjectedBundlePageFullScreenClient : public APIClient<WKBundlePageFullScreenClient, kWKBundlePageFullScreenClientCurrentVersion> {
public:
bool supportsFullScreen(WebPage*, bool withKeyboard);
void enterFullScreenForElement(WebPage*, WebCore::Element*);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -45,7 +45,7 @@
class WebPage;
class WebFrame;
-class InjectedBundlePageLoaderClient : public APIClient<WKBundlePageLoaderClient> {
+class InjectedBundlePageLoaderClient : public APIClient<WKBundlePageLoaderClient, kWKBundlePageLoaderClientCurrentVersion> {
public:
void didStartProvisionalLoadForFrame(WebPage*, WebFrame*, RefPtr<APIObject>& userData);
void didReceiveServerRedirectForProvisionalLoadForFrame(WebPage*, WebFrame*, RefPtr<APIObject>& userData);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -43,7 +43,7 @@
class WebFrame;
class WebPage;
-class InjectedBundlePagePolicyClient : public APIClient<WKBundlePagePolicyClient> {
+class InjectedBundlePagePolicyClient : public APIClient<WKBundlePagePolicyClient, kWKBundlePagePolicyClientCurrentVersion> {
public:
WKBundlePagePolicyAction decidePolicyForNavigationAction(WebPage*, WebFrame*, InjectedBundleNavigationAction*, const WebCore::ResourceRequest&, RefPtr<APIObject>& userData);
WKBundlePagePolicyAction decidePolicyForNewWindowAction(WebPage*, WebFrame*, InjectedBundleNavigationAction*, const WebCore::ResourceRequest&, const String& frameName, RefPtr<APIObject>& userData);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageResourceLoadClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -44,7 +44,7 @@
class WebPage;
class WebFrame;
-class InjectedBundlePageResourceLoadClient : public APIClient<WKBundlePageResourceLoadClient> {
+class InjectedBundlePageResourceLoadClient : public APIClient<WKBundlePageResourceLoadClient, kWKBundlePageResourceLoadClientCurrentVersion> {
public:
void didInitiateLoadForResource(WebPage*, WebFrame*, uint64_t identifier, const WebCore::ResourceRequest&, bool pageIsProvisionallyLoading);
void willSendRequestForFrame(WebPage*, WebFrame*, uint64_t identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h (90160 => 90161)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2011-06-30 21:46:23 UTC (rev 90160)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageUIClient.h 2011-06-30 21:46:31 UTC (rev 90161)
@@ -43,7 +43,7 @@
class WebFrame;
class WebPage;
-class InjectedBundlePageUIClient : public APIClient<WKBundlePageUIClient> {
+class InjectedBundlePageUIClient : public APIClient<WKBundlePageUIClient, kWKBundlePageUIClientCurrentVersion> {
public:
void willAddMessageToConsole(WebPage*, const String& message, int32_t lineNumber);
void willSetStatusbarText(WebPage*, const String&);
