- Revision
- 90224
- Author
- [email protected]
- Date
- 2011-07-01 06:25:03 -0700 (Fri, 01 Jul 2011)
Log Message
Unreviewed due to fixing of a broken world.
REGRESSION (r90163): WebKit2 bot is failing 100% of the tests.
r90163 bumped the version of the WKBundlePageLoaderClient passed in by WebKitTestRunner from 0 to 1.
This made it run in to the ad-hoc client version checking implemented directly in WKBundlePageSetPageLoaderClient,
resulting in no client being set. After r90162 the ad-hoc checking is not necessary as the APIClient
template takes care of the relevant version checks.
* Shared/APIClient.h:
(WebKit::APIClient::initialize): Fix a bug I noticed along the way: don't attempt to copy anything if
the client version is newer than what we support. This matches the behavior of the ad-hoc version checking.
* UIProcess/API/C/WKContext.cpp:
(WKContextSetInjectedBundleClient): Drop the ad-hoc version checking.
(WKContextSetHistoryClient): Ditto.
(WKContextSetDownloadClient): Ditto.
* UIProcess/API/C/WKCookieManager.cpp:
(WKCookieManagerSetClient): Ditto.
* UIProcess/API/C/WKGeolocationManager.cpp:
(WKGeolocationManagerSetProvider): Ditto.
* UIProcess/API/C/WKIconDatabase.cpp:
(WKIconDatabaseSetIconDatabaseClient): Ditto.
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageContextMenuClient): Ditto.
(WKPageSetPageFindClient): Ditto.
(WKPageSetPageFormClient): Ditto.
(WKPageSetPageLoaderClient): Ditto.
(WKPageSetPagePolicyClient): Ditto.
(WKPageSetPageResourceLoadClient): Ditto.
(WKPageSetPageUIClient): Ditto.
* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
(WKBundleSetClient): Ditto.
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageSetContextMenuClient): Ditto.
(WKBundlePageSetEditorClient): Ditto.
(WKBundlePageSetFormClient): Ditto.
(WKBundlePageSetPageLoaderClient): Ditto.
(WKBundlePageSetResourceLoadClient): Ditto.
(WKBundlePageSetPolicyClient): Ditto.
(WKBundlePageSetUIClient): Ditto.
(WKBundlePageSetFullScreenClient): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (90223 => 90224)
--- trunk/Source/WebKit2/ChangeLog 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-01 13:25:03 UTC (rev 90224)
@@ -1,3 +1,47 @@
+2011-07-01 Mark Rowe <[email protected]>
+
+ Unreviewed due to fixing of a broken world.
+
+ REGRESSION (r90163): WebKit2 bot is failing 100% of the tests.
+
+ r90163 bumped the version of the WKBundlePageLoaderClient passed in by WebKitTestRunner from 0 to 1.
+ This made it run in to the ad-hoc client version checking implemented directly in WKBundlePageSetPageLoaderClient,
+ resulting in no client being set. After r90162 the ad-hoc checking is not necessary as the APIClient
+ template takes care of the relevant version checks.
+
+ * Shared/APIClient.h:
+ (WebKit::APIClient::initialize): Fix a bug I noticed along the way: don't attempt to copy anything if
+ the client version is newer than what we support. This matches the behavior of the ad-hoc version checking.
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetInjectedBundleClient): Drop the ad-hoc version checking.
+ (WKContextSetHistoryClient): Ditto.
+ (WKContextSetDownloadClient): Ditto.
+ * UIProcess/API/C/WKCookieManager.cpp:
+ (WKCookieManagerSetClient): Ditto.
+ * UIProcess/API/C/WKGeolocationManager.cpp:
+ (WKGeolocationManagerSetProvider): Ditto.
+ * UIProcess/API/C/WKIconDatabase.cpp:
+ (WKIconDatabaseSetIconDatabaseClient): Ditto.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageContextMenuClient): Ditto.
+ (WKPageSetPageFindClient): Ditto.
+ (WKPageSetPageFormClient): Ditto.
+ (WKPageSetPageLoaderClient): Ditto.
+ (WKPageSetPagePolicyClient): Ditto.
+ (WKPageSetPageResourceLoadClient): Ditto.
+ (WKPageSetPageUIClient): Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleSetClient): Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetContextMenuClient): Ditto.
+ (WKBundlePageSetEditorClient): Ditto.
+ (WKBundlePageSetFormClient): Ditto.
+ (WKBundlePageSetPageLoaderClient): Ditto.
+ (WKBundlePageSetResourceLoadClient): Ditto.
+ (WKBundlePageSetPolicyClient): Ditto.
+ (WKBundlePageSetUIClient): Ditto.
+ (WKBundlePageSetFullScreenClient): Ditto.
+
2011-06-30 Darin Adler <[email protected]>
Reviewed by Anders Carlsson.
Modified: trunk/Source/WebKit2/Shared/APIClient.h (90223 => 90224)
--- trunk/Source/WebKit2/Shared/APIClient.h 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/Shared/APIClient.h 2011-07-01 13:25:03 UTC (rev 90224)
@@ -48,7 +48,7 @@
memset(&m_client, 0, sizeof(m_client));
- if (client)
+ if (client && client->version < currentVersion)
memcpy(&m_client, client, APIClientTraits<ClientInterface>::interfaceSizesByVersion[client->version]);
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (90223 => 90224)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2011-07-01 13:25:03 UTC (rev 90224)
@@ -65,22 +65,16 @@
void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(contextRef)->initializeInjectedBundleClient(wkClient);
}
void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(contextRef)->initializeHistoryClient(wkClient);
}
void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(contextRef)->initializeDownloadClient(wkClient);
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp (90223 => 90224)
--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2011-07-01 13:25:03 UTC (rev 90224)
@@ -38,8 +38,6 @@
void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(cookieManagerRef)->initializeClient(wkClient);
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp (90223 => 90224)
--- trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp 2011-07-01 13:25:03 UTC (rev 90224)
@@ -38,8 +38,6 @@
void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProvider* wkProvider)
{
- if (wkProvider && wkProvider->version)
- return;
toImpl(geolocationManagerRef)->initializeProvider(wkProvider);
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp (90223 => 90224)
--- trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp 2011-07-01 13:25:03 UTC (rev 90224)
@@ -38,8 +38,6 @@
void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(iconDatabaseRef)->initializeIconDatabaseClient(wkClient);
}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (90223 => 90224)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2011-07-01 13:25:03 UTC (rev 90224)
@@ -371,50 +371,36 @@
void WKPageSetPageContextMenuClient(WKPageRef pageRef, const WKPageContextMenuClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeContextMenuClient(wkClient);
}
void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeFindClient(wkClient);
}
void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeFormClient(wkClient);
}
void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeLoaderClient(wkClient);
}
void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializePolicyClient(wkClient);
}
void WKPageSetPageResourceLoadClient(WKPageRef pageRef, const WKPageResourceLoadClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeResourceLoadClient(wkClient);
}
void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeUIClient(wkClient);
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (90223 => 90224)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2011-07-01 13:25:03 UTC (rev 90224)
@@ -40,8 +40,6 @@
void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient * wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(bundleRef)->initializeClient(wkClient);
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (90223 => 90224)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2011-07-01 12:51:24 UTC (rev 90223)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2011-07-01 13:25:03 UTC (rev 90224)
@@ -48,58 +48,42 @@
void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundleContextMenuClient(wkClient);
}
void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundleEditorClient(wkClient);
}
void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundleFormClient(wkClient);
}
void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundleLoaderClient(wkClient);
}
void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(wkClient);
}
void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
}
void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClient* wkClient)
{
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundleUIClient(wkClient);
}
void WKBundlePageSetFullScreenClient(WKBundlePageRef pageRef, WKBundlePageFullScreenClient* wkClient)
{
#if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
- if (wkClient && wkClient->version)
- return;
toImpl(pageRef)->initializeInjectedBundleFullScreenClient(wkClient);
#endif
}
