Diff
Modified: trunk/Source/WebKit2/ChangeLog (160124 => 160125)
--- trunk/Source/WebKit2/ChangeLog 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 22:18:40 UTC (rev 160125)
@@ -1,3 +1,27 @@
+2013-12-04 Nick Diego Yamane <[email protected]>
+
+ [GTK][WK2] Fix build after r160104
+ https://bugs.webkit.org/show_bug.cgi?id=125240
+
+ Reviewed by Anders Carlsson.
+
+ Using specific version of API client when instantiating them.
+ Applied that same change to the following files:
+
+ * UIProcess/API/gtk/WebKitContextMenuClient.cpp:
+ * UIProcess/API/gtk/WebKitCookieManager.cpp:
+ * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+ * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
+ * UIProcess/API/gtk/WebKitFindController.cpp:
+ * UIProcess/API/gtk/WebKitFormClient.cpp:
+ * UIProcess/API/gtk/WebKitGeolocationProvider.cpp:
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ * UIProcess/API/gtk/WebKitLoaderClient.cpp:
+ * UIProcess/API/gtk/WebKitPolicyClient.cpp:
+ * UIProcess/API/gtk/WebKitUIClient.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+
2013-12-04 Dan Bernstein <[email protected]>
Fixed the 32-bit Mac build.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -33,9 +33,11 @@
void attachContextMenuClientToView(WebKitWebView* webView)
{
- WKPageContextMenuClient wkContextMenuClient = {
- kWKPageContextMenuClientCurrentVersion,
- webView, // clientInfo
+ WKPageContextMenuClientV3 wkContextMenuClient = {
+ {
+ 3, // version
+ webView, // clientInfo
+ },
0, // getContextMenuFromProposedMenu_deprecatedForUseWithV0
0, // customContextMenuItemSelected
0, // contextMenuDismissed
@@ -44,6 +46,6 @@
0, // hideContextMenu
};
WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
- WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient);
+ WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -100,12 +100,14 @@
WebKitCookieManager* manager = WEBKIT_COOKIE_MANAGER(g_object_new(WEBKIT_TYPE_COOKIE_MANAGER, NULL));
manager->priv->webCookieManager = webCookieManager;
- WKCookieManagerClient wkCookieManagerClient = {
- kWKCookieManagerClientCurrentVersion,
- manager, // clientInfo
+ WKCookieManagerClientV0 wkCookieManagerClient = {
+ {
+ 0, // version
+ manager, // clientInfo
+ },
cookiesDidChange
};
- WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient);
+ WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient.base);
manager->priv->webCookieManager->startObservingCookieChanges();
return manager;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -95,9 +95,11 @@
void attachDownloadClientToContext(WebKitWebContext* webContext)
{
- WKContextDownloadClient wkDownloadClient = {
- kWKContextDownloadClientCurrentVersion,
- webContext, // ClientInfo
+ WKContextDownloadClientV0 wkDownloadClient = {
+ {
+ 0, // version
+ webContext, // ClientInfo
+ },
didStart,
0, // didReceiveAuthenticationChallenge
didReceiveResponse,
@@ -110,6 +112,6 @@
didCancel,
0, // processDidCrash
};
- WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient);
+ WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -214,14 +214,16 @@
WebKitFaviconDatabase* faviconDatabase = WEBKIT_FAVICON_DATABASE(g_object_new(WEBKIT_TYPE_FAVICON_DATABASE, NULL));
faviconDatabase->priv->iconDatabase = iconDatabase;
- WKIconDatabaseClient wkIconDatabaseClient = {
- kWKIconDatabaseClientCurrentVersion,
- faviconDatabase, // clientInfo
+ WKIconDatabaseClientV1 wkIconDatabaseClient = {
+ {
+ 1, // version
+ faviconDatabase, // clientInfo
+ },
didChangeIconForPageURLCallback,
0, // didRemoveAllIconsCallback
iconDataReadyForPageURLCallback,
};
- WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient);
+ WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient.base);
return faviconDatabase;
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -111,15 +111,17 @@
static void webkitFindControllerConstructed(GObject* object)
{
WebKitFindController* findController = WEBKIT_FIND_CONTROLLER(object);
- WKPageFindClient wkFindClient = {
- kWKPageFindClientCurrentVersion,
- findController, // clientInfo
+ WKPageFindClientV0 wkFindClient = {
+ {
+ 0, // version
+ findController, // clientInfo
+ },
didFindString,
didFailToFindString,
didCountStringMatches
};
- WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient);
+ WKPageSetPageFindClient(toAPI(getPage(findController)), &wkFindClient.base);
}
static void webkitFindControllerGetProperty(GObject* object, guint propId, GValue* value, GParamSpec* paramSpec)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -36,11 +36,13 @@
void attachFormClientToView(WebKitWebView* webView)
{
- WKPageFormClient wkFormClient = {
- kWKPageFormClientCurrentVersion,
- webView, // clientInfo
+ WKPageFormClientV0 wkFormClient = {
+ {
+ 0, // version
+ webView, // clientInfo
+ },
willSubmitForm
};
WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
- WKPageSetPageFormClient(wkPage, &wkFormClient);
+ WKPageSetPageFormClient(wkPage, &wkFormClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitGeolocationProvider.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -64,13 +64,16 @@
{
ASSERT(geolocationManager);
- WKGeolocationProvider wkGeolocationProvider = {
- kWKGeolocationProviderCurrentVersion,
- this, // clientInfo
+ WKGeolocationProviderV1 wkGeolocationProvider = {
+ {
+ 1, // version
+ this, // clientInfo
+ },
startUpdatingCallback,
- stopUpdatingCallback
+ stopUpdatingCallback,
+ 0 // setEnableHighAccuracy
};
- WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider);
+ WKGeolocationManagerSetProvider(toAPI(geolocationManager), &wkGeolocationProvider.base);
}
void WebKitGeolocationProvider::startUpdating()
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -120,12 +120,14 @@
void attachInjectedBundleClientToContext(WebKitWebContext* webContext)
{
- WKContextInjectedBundleClient wkInjectedBundleClient = {
- kWKContextInjectedBundleClientCurrentVersion,
- webContext, // clientInfo
+ WKContextInjectedBundleClientV1 wkInjectedBundleClient = {
+ {
+ 0, // version
+ webContext, // clientInfo
+ },
didReceiveMessageFromInjectedBundle,
0, // didReceiveSynchronousMessageFromInjectedBundle
0 // getInjectedBundleInitializationUserData
};
- WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient);
+ WKContextSetInjectedBundleClient(toAPI(webkitWebContextGetContext(webContext)), &wkInjectedBundleClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -140,9 +140,11 @@
void attachLoaderClientToView(WebKitWebView* webView)
{
- WKPageLoaderClient wkLoaderClient = {
- kWKPageLoaderClientCurrentVersion,
- webView, // clientInfo
+ WKPageLoaderClientV3 wkLoaderClient = {
+ {
+ 3, // version
+ webView, // clientInfo
+ },
didStartProvisionalLoadForFrame,
didReceiveServerRedirectForProvisionalLoadForFrame,
didFailProvisionalLoadWithErrorForFrame,
@@ -181,6 +183,6 @@
0, // pluginLoadPolicy
};
WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
- WKPageSetPageLoaderClient(wkPage, &wkLoaderClient);
+ WKPageSetPageLoaderClient(wkPage, &wkLoaderClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -68,9 +68,11 @@
void attachPolicyClientToView(WebKitWebView* webView)
{
- WKPagePolicyClient policyClient = {
- kWKPagePolicyClientCurrentVersion,
- webView, // clientInfo
+ WKPagePolicyClientV1 policyClient = {
+ {
+ 1, // version
+ webView, // clientInfo
+ },
0, // decidePolicyForNavigationAction_deprecatedForUseWithV0
decidePolicyForNewWindowAction,
0, // decidePolicyForResponse_deprecatedForUseWithV0
@@ -78,5 +80,5 @@
decidePolicyForNavigationAction,
decidePolicyForResponse
};
- WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient);
+ WKPageSetPagePolicyClient(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))), &policyClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (160124 => 160125)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -160,9 +160,11 @@
void attachUIClientToView(WebKitWebView* webView)
{
- WKPageUIClient wkUIClient = {
- kWKPageUIClientCurrentVersion,
- webView, // clientInfo
+ WKPageUIClientV2 wkUIClient = {
+ {
+ 2, // version
+ webView, // clientInfo
+ },
0, // createNewPage_deprecatedForUseWithV0
showPage,
closePage,
@@ -211,6 +213,6 @@
0, // pluginLoadPolicy
};
WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
- WKPageSetPageUIClient(wkPage, &wkUIClient);
+ WKPageSetPageUIClient(wkPage, &wkUIClient.base);
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (160124 => 160125)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -116,16 +116,18 @@
{
WebKitWebExtension* extension = WEBKIT_WEB_EXTENSION(g_object_new(WEBKIT_TYPE_WEB_EXTENSION, NULL));
- WKBundleClient wkBundleClient = {
- kWKBundleClientCurrentVersion,
- extension, // clientInfo
+ WKBundleClientV1 wkBundleClient = {
+ {
+ 1, // version
+ extension, // clientInfo
+ },
didCreatePage,
willDestroyPage,
0, // didInitializePageGroup
didReceiveMessage,
didReceiveMessageToPage
};
- WKBundleSetClient(toAPI(bundle), &wkBundleClient);
+ WKBundleSetClient(toAPI(bundle), &wkBundleClient.base);
return extension;
}
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (160124 => 160125)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2013-12-04 22:16:30 UTC (rev 160124)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2013-12-04 22:18:40 UTC (rev 160125)
@@ -309,9 +309,11 @@
WebKitWebPage* page = WEBKIT_WEB_PAGE(g_object_new(WEBKIT_TYPE_WEB_PAGE, NULL));
page->priv->webPage = webPage;
- WKBundlePageLoaderClient loaderClient = {
- kWKBundlePageLoaderClientCurrentVersion,
- page,
+ WKBundlePageLoaderClientV7 loaderClient = {
+ {
+ 7, // version
+ page, // clientInfo
+ },
didStartProvisionalLoadForFrame,
didReceiveServerRedirectForProvisionalLoadForFrame,
0, // didFailProvisionalLoadWithErrorForFrame
@@ -348,11 +350,13 @@
0, // willLoadDataRequest
willDestroyFrame
};
- WKBundlePageSetPageLoaderClient(toAPI(webPage), &loaderClient);
+ WKBundlePageSetPageLoaderClient(toAPI(webPage), &loaderClient.base);
- WKBundlePageResourceLoadClient resourceLoadClient = {
- kWKBundlePageResourceLoadClientCurrentVersion,
- page,
+ WKBundlePageResourceLoadClientV1 resourceLoadClient = {
+ {
+ 1, // version
+ page, // clientInfo
+ },
didInitiateLoadForResource,
willSendRequestForFrame,
didReceiveResponseForResource,
@@ -362,7 +366,7 @@
0, // shouldCacheResponse
0 // shouldUseCredentialStorage
};
- WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient);
+ WKBundlePageSetResourceLoadClient(toAPI(webPage), &resourceLoadClient.base);
return page;
}
