Changeset 90224 in webkit

Timestamp:

Jul 1, 2011, 6:25:03 AM (15 years ago)

Author:

mrowe@apple.com

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/APIClient.h (modified) (1 diff)
• UIProcess/API/C/WKContext.cpp (modified) (3 diffs)
• UIProcess/API/C/WKCookieManager.cpp (modified) (1 diff)
• UIProcess/API/C/WKGeolocationManager.cpp (modified) (1 diff)
• UIProcess/API/C/WKIconDatabase.cpp (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (7 diffs)
• WebProcess/InjectedBundle/API/c/WKBundle.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (modified) (8 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-07-01  Mark Rowe  <mrowe@apple.com>
+
+        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  <darin@apple.com>
 

trunk/Source/WebKit2/Shared/APIClient.h

@@ -49 +49 @@
         memset(&m_client, 0, sizeof(m_client));
 
-        if (client)
+        if (client && client->version < currentVersion)
             memcpy(&m_client, client, APIClientTraits<ClientInterface>::interfaceSizesByVersion[client->version]);
     }

trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -66 +66 @@
 void WKContextSetInjectedBundleClient(WKContextRef contextRef, const WKContextInjectedBundleClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(contextRef)->initializeInjectedBundleClient(wkClient);
 }
@@ -73 +71 @@
 void WKContextSetHistoryClient(WKContextRef contextRef, const WKContextHistoryClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(contextRef)->initializeHistoryClient(wkClient);
 }
@@ -80 +76 @@
 void WKContextSetDownloadClient(WKContextRef contextRef, const WKContextDownloadClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(contextRef)->initializeDownloadClient(wkClient);
 }

trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp

@@ -39 +39 @@
 void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(cookieManagerRef)->initializeClient(wkClient);
 }

trunk/Source/WebKit2/UIProcess/API/C/WKGeolocationManager.cpp

@@ -39 +39 @@
 void WKGeolocationManagerSetProvider(WKGeolocationManagerRef geolocationManagerRef, const WKGeolocationProvider* wkProvider)
 {
-    if (wkProvider && wkProvider->version)
-        return;
     toImpl(geolocationManagerRef)->initializeProvider(wkProvider);
 }

trunk/Source/WebKit2/UIProcess/API/C/WKIconDatabase.cpp

@@ -39 +39 @@
 void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef iconDatabaseRef, const WKIconDatabaseClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(iconDatabaseRef)->initializeIconDatabaseClient(wkClient);
 }

trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp

@@ -372 +372 @@
 void WKPageSetPageContextMenuClient(WKPageRef pageRef, const WKPageContextMenuClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeContextMenuClient(wkClient);
 }
@@ -379 +377 @@
 void WKPageSetPageFindClient(WKPageRef pageRef, const WKPageFindClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeFindClient(wkClient);
 }
@@ -386 +382 @@
 void WKPageSetPageFormClient(WKPageRef pageRef, const WKPageFormClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeFormClient(wkClient);
 }
@@ -393 +387 @@
 void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeLoaderClient(wkClient);
 }
@@ -400 +392 @@
 void WKPageSetPagePolicyClient(WKPageRef pageRef, const WKPagePolicyClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializePolicyClient(wkClient);
 }
@@ -407 +397 @@
 void WKPageSetPageResourceLoadClient(WKPageRef pageRef, const WKPageResourceLoadClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeResourceLoadClient(wkClient);
 }
@@ -414 +402 @@
 void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeUIClient(wkClient);
 }

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp

@@ -41 +41 @@
 void WKBundleSetClient(WKBundleRef bundleRef, WKBundleClient * wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(bundleRef)->initializeClient(wkClient);
 }

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp

@@ -49 +49 @@
 void WKBundlePageSetContextMenuClient(WKBundlePageRef pageRef, WKBundlePageContextMenuClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundleContextMenuClient(wkClient);
 }
@@ -56 +54 @@
 void WKBundlePageSetEditorClient(WKBundlePageRef pageRef, WKBundlePageEditorClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundleEditorClient(wkClient);
 }
@@ -63 +59 @@
 void WKBundlePageSetFormClient(WKBundlePageRef pageRef, WKBundlePageFormClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundleFormClient(wkClient);
 }
@@ -70 +64 @@
 void WKBundlePageSetPageLoaderClient(WKBundlePageRef pageRef, WKBundlePageLoaderClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundleLoaderClient(wkClient);
 }
@@ -77 +69 @@
 void WKBundlePageSetResourceLoadClient(WKBundlePageRef pageRef, WKBundlePageResourceLoadClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundleResourceLoadClient(wkClient);
 }
@@ -84 +74 @@
 void WKBundlePageSetPolicyClient(WKBundlePageRef pageRef, WKBundlePagePolicyClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundlePolicyClient(wkClient);
 }
@@ -91 +79 @@
 void WKBundlePageSetUIClient(WKBundlePageRef pageRef, WKBundlePageUIClient* wkClient)
 {
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundleUIClient(wkClient);
 }
@@ -99 +85 @@
 {
 #if defined(ENABLE_FULLSCREEN_API) && ENABLE_FULLSCREEN_API
-    if (wkClient && wkClient->version)
-        return;
     toImpl(pageRef)->initializeInjectedBundleFullScreenClient(wkClient);
 #endif