Diff
Modified: trunk/Source/WebKit2/ChangeLog (160106 => 160107)
--- trunk/Source/WebKit2/ChangeLog 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-04 19:15:58 UTC (rev 160107)
@@ -1,3 +1,31 @@
+2013-12-04 Csaba Osztrogonác <[email protected]>
+
+ [EFL][WK2] Buildfix after r160104
+ https://bugs.webkit.org/show_bug.cgi?id=125233
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/efl/ewk_cookie_manager.cpp:
+ (EwkCookieManager::EwkCookieManager):
+ * UIProcess/API/efl/ewk_favicon_database.cpp:
+ (EwkFaviconDatabase::EwkFaviconDatabase):
+ * UIProcess/efl/ContextHistoryClientEfl.cpp:
+ (WebKit::ContextHistoryClientEfl::ContextHistoryClientEfl):
+ * UIProcess/efl/ContextMenuClientEfl.cpp:
+ (ContextMenuClientEfl::ContextMenuClientEfl):
+ * UIProcess/efl/DownloadManagerEfl.cpp:
+ (WebKit::DownloadManagerEfl::DownloadManagerEfl):
+ * UIProcess/efl/FindClientEfl.cpp:
+ (WebKit::FindClientEfl::FindClientEfl):
+ * UIProcess/efl/FormClientEfl.cpp:
+ (WebKit::FormClientEfl::FormClientEfl):
+ * UIProcess/efl/PageLoadClientEfl.cpp:
+ (WebKit::PageLoadClientEfl::PageLoadClientEfl):
+ * UIProcess/efl/PagePolicyClientEfl.cpp:
+ (WebKit::PagePolicyClientEfl::PagePolicyClientEfl):
+ * UIProcess/efl/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::PageUIClientEfl):
+
2013-12-03 Anders Carlsson <[email protected]>
Deprecate all unversioned client structs in favor of having explicit versioned structs
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_cookie_manager.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -42,12 +42,12 @@
{
ASSERT(m_cookieManager);
- WKCookieManagerClient wkCookieManagerClient = {
- kWKCookieManagerClientCurrentVersion,
- this, // clientInfo
- cookiesDidChange
- };
- WKCookieManagerSetClient(m_cookieManager.get(), &wkCookieManagerClient);
+ WKCookieManagerClientV0 wkCookieManagerClient;
+ memset(&wkCookieManagerClient, 0, sizeof(wkCookieManagerClient));
+ wkCookieManagerClient.base.version = 0;
+ wkCookieManagerClient.base.clientInfo = this;
+ wkCookieManagerClient.cookiesDidChange = cookiesDidChange;
+ WKCookieManagerSetClient(m_cookieManager.get(), &wkCookieManagerClient.base);
}
EwkCookieManager::~EwkCookieManager()
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -42,12 +42,12 @@
EwkFaviconDatabase::EwkFaviconDatabase(WKIconDatabaseRef iconDatabase)
: m_iconDatabase(iconDatabase)
{
- WKIconDatabaseClient iconDatabaseClient;
+ WKIconDatabaseClientV1 iconDatabaseClient;
memset(&iconDatabaseClient, 0, sizeof(WKIconDatabaseClient));
- iconDatabaseClient.version = kWKIconDatabaseClientCurrentVersion;
- iconDatabaseClient.clientInfo = this;
+ iconDatabaseClient.base.version = kWKIconDatabaseClientCurrentVersion;
+ iconDatabaseClient.base.clientInfo = this;
iconDatabaseClient.iconDataReadyForPageURL = iconDataReadyForPageURL;
- WKIconDatabaseSetIconDatabaseClient(m_iconDatabase.get(), &iconDatabaseClient);
+ WKIconDatabaseSetIconDatabaseClient(m_iconDatabase.get(), &iconDatabaseClient.base);
}
EwkFaviconDatabase::~EwkFaviconDatabase()
Modified: trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -116,11 +116,11 @@
{
ASSERT(m_context);
- WKContextHistoryClient wkHistoryClient;
+ WKContextHistoryClientV0 wkHistoryClient;
memset(&wkHistoryClient, 0, sizeof(WKContextHistoryClient));
- wkHistoryClient.version = kWKContextHistoryClientCurrentVersion;
- wkHistoryClient.clientInfo = this;
+ wkHistoryClient.base.version = 0;
+ wkHistoryClient.base.clientInfo = this;
wkHistoryClient.didNavigateWithNavigationData = didNavigateWithNavigationData;
wkHistoryClient.didPerformClientRedirect = didPerformClientRedirect;
@@ -128,7 +128,7 @@
wkHistoryClient.didUpdateHistoryTitle = didUpdateHistoryTitle;
wkHistoryClient.populateVisitedLinks = populateVisitedLinks;
- WKContextSetHistoryClient(m_context.get(), &wkHistoryClient);
+ WKContextSetHistoryClient(m_context.get(), &wkHistoryClient.base);
}
ContextHistoryClientEfl::~ContextHistoryClientEfl()
Modified: trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -58,10 +58,10 @@
WKPageRef pageRef = m_view->wkPage();
ASSERT(pageRef);
- WKPageContextMenuClient contextMenuClient;
+ WKPageContextMenuClientV3 contextMenuClient;
memset(&contextMenuClient, 0, sizeof(WKPageContextMenuClient));
- contextMenuClient.version = kWKPageContextMenuClientCurrentVersion;
- contextMenuClient.clientInfo = this;
+ contextMenuClient.base.version = 3;
+ contextMenuClient.base.clientInfo = this;
contextMenuClient.getContextMenuFromProposedMenu_deprecatedForUseWithV0 = 0;
contextMenuClient.customContextMenuItemSelected = customContextMenuItemSelected;
contextMenuClient.contextMenuDismissed = 0;
@@ -69,6 +69,6 @@
contextMenuClient.showContextMenu = showContextMenu;
contextMenuClient.hideContextMenu = hideContextMenu;
- WKPageSetPageContextMenuClient(pageRef, &contextMenuClient);
+ WKPageSetPageContextMenuClient(pageRef, &contextMenuClient.base);
}
Modified: trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -120,11 +120,11 @@
DownloadManagerEfl::DownloadManagerEfl(WKContextRef context)
: m_context(context)
{
- WKContextDownloadClient wkDownloadClient;
+ WKContextDownloadClientV0 wkDownloadClient;
memset(&wkDownloadClient, 0, sizeof(WKContextDownloadClient));
- wkDownloadClient.version = kWKContextDownloadClientCurrentVersion;
- wkDownloadClient.clientInfo = this;
+ wkDownloadClient.base.version = 0;
+ wkDownloadClient.base.clientInfo = this;
wkDownloadClient.didCancel = didCancel;
wkDownloadClient.decideDestinationWithSuggestedFilename = decideDestinationWithSuggestedFilename;
wkDownloadClient.didCreateDestination = didCreateDestination;
@@ -133,7 +133,7 @@
wkDownloadClient.didFail = didFail;
wkDownloadClient.didFinish = didFinish;
- WKContextSetDownloadClient(m_context.get(), &wkDownloadClient);
+ WKContextSetDownloadClient(m_context.get(), &wkDownloadClient.base);
}
DownloadManagerEfl::~DownloadManagerEfl()
Modified: trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -58,14 +58,14 @@
WKPageRef pageRef = m_view->wkPage();
ASSERT(pageRef);
- WKPageFindClient findClient;
+ WKPageFindClientV0 findClient;
memset(&findClient, 0, sizeof(WKPageFindClient));
- findClient.version = kWKPageFindClientCurrentVersion;
- findClient.clientInfo = this;
+ findClient.base.version = 0;
+ findClient.base.clientInfo = this;
findClient.didFindString = didFindString;
findClient.didFailToFindString = didFailToFindString;
findClient.didCountStringMatches = didFindString;
- WKPageSetPageFindClient(pageRef, &findClient);
+ WKPageSetPageFindClient(pageRef, &findClient.base);
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -53,12 +53,12 @@
WKPageRef pageRef = m_view->wkPage();
ASSERT(pageRef);
- WKPageFormClient formClient;
+ WKPageFormClientV0 formClient;
memset(&formClient, 0, sizeof(WKPageFormClient));
- formClient.version = kWKPageFormClientCurrentVersion;
- formClient.clientInfo = this;
+ formClient.base.version = 0;
+ formClient.base.clientInfo = this;
formClient.willSubmitForm = willSubmitForm;
- WKPageSetPageFormClient(pageRef, &formClient);
+ WKPageSetPageFormClient(pageRef, &formClient.base);
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/PageLoadClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -162,10 +162,10 @@
WKPageRef pageRef = m_view->wkPage();
ASSERT(pageRef);
- WKPageLoaderClient loadClient;
+ WKPageLoaderClientV3 loadClient;
memset(&loadClient, 0, sizeof(WKPageLoaderClient));
- loadClient.version = kWKPageLoaderClientCurrentVersion;
- loadClient.clientInfo = this;
+ loadClient.base.version = 3;
+ loadClient.base.clientInfo = this;
loadClient.didReceiveTitleForFrame = didReceiveTitleForFrame;
loadClient.didStartProgress = didChangeProgress;
loadClient.didChangeProgress = didChangeProgress;
@@ -179,7 +179,7 @@
loadClient.didChangeBackForwardList = didChangeBackForwardList;
loadClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
loadClient.didReceiveAuthenticationChallengeInFrame = didReceiveAuthenticationChallengeInFrame;
- WKPageSetPageLoaderClient(pageRef, &loadClient);
+ WKPageSetPageLoaderClient(pageRef, &loadClient.base);
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/PagePolicyClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -105,15 +105,15 @@
WKPageRef pageRef = m_view->wkPage();
ASSERT(pageRef);
- WKPagePolicyClient policyClient;
+ WKPagePolicyClientV1 policyClient;
memset(&policyClient, 0, sizeof(WKPagePolicyClient));
- policyClient.version = kWKPagePolicyClientCurrentVersion;
- policyClient.clientInfo = this;
+ policyClient.base.version = 1;
+ policyClient.base.clientInfo = this;
policyClient.decidePolicyForNavigationAction = decidePolicyForNavigationAction;
policyClient.decidePolicyForNewWindowAction = decidePolicyForNewWindowAction;
policyClient.decidePolicyForResponse = decidePolicyForResponseCallback;
- WKPageSetPagePolicyClient(pageRef, &policyClient);
+ WKPageSetPagePolicyClient(pageRef, &policyClient.base);
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp (160106 => 160107)
--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -52,10 +52,10 @@
WKPageRef pageRef = m_view->wkPage();
ASSERT(pageRef);
- WKPageUIClient uiClient;
+ WKPageUIClientV2 uiClient;
memset(&uiClient, 0, sizeof(WKPageUIClient));
- uiClient.version = kWKPageUIClientCurrentVersion;
- uiClient.clientInfo = this;
+ uiClient.base.version = 2;
+ uiClient.base.clientInfo = this;
uiClient.close = close;
uiClient.takeFocus = takeFocus;
uiClient.focus = focus;
@@ -84,7 +84,7 @@
uiClient.hideColorPicker = hideColorPicker;
#endif
- WKPageSetPageUIClient(pageRef, &uiClient);
+ WKPageSetPageUIClient(pageRef, &uiClient.base);
// Popup Menu UI client.
WKPageUIPopupMenuClientV0 uiPopupMenuClient;
@@ -93,7 +93,7 @@
uiPopupMenuClient.base.clientInfo = this;
uiPopupMenuClient.showPopupMenu = showPopupMenu;
uiPopupMenuClient.hidePopupMenu = hidePopupMenu;
- WKPageSetUIPopupMenuClient(pageRef, reinterpret_cast<WKPageUIPopupMenuClientBase*>(&uiPopupMenuClient));
+ WKPageSetUIPopupMenuClient(pageRef, &uiPopupMenuClient.base);
}
Modified: trunk/Tools/ChangeLog (160106 => 160107)
--- trunk/Tools/ChangeLog 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Tools/ChangeLog 2013-12-04 19:15:58 UTC (rev 160107)
@@ -1,3 +1,15 @@
+2013-12-04 Csaba Osztrogonác <[email protected]>
+
+ [EFL][WK2] Buildfix after r160104
+ https://bugs.webkit.org/show_bug.cgi?id=125233
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+
2013-12-03 Anders Carlsson <[email protected]>
Deprecate all unversioned client structs in favor of having explicit versioned structs
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp (160106 => 160107)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/CoordinatedGraphics/WKViewIsActiveSetIsActive.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -99,11 +99,11 @@
// At this point we should have an active view.
ASSERT_TRUE(WKViewIsActive(view.get()));
- WKPageLoaderClient pageLoaderClient;
+ WKPageLoaderClientV3 pageLoaderClient;
memset(&pageLoaderClient, 0, sizeof(WKPageLoaderClient));
- pageLoaderClient.version = kWKPageLoaderClientCurrentVersion;
+ pageLoaderClient.base.version = 3;
pageLoaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
- WKPageSetPageLoaderClient(WKViewGetPage(view.get()), &pageLoaderClient);
+ WKPageSetPageLoaderClient(WKViewGetPage(view.get()), &pageLoaderClient.base);
const WKSize size = WKSizeMake(100, 100);
WKViewSetSize(view.get(), size);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp (160106 => 160107)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp 2013-12-04 19:02:59 UTC (rev 160106)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/efl/WKViewClientWebProcessCallbacks.cpp 2013-12-04 19:15:58 UTC (rev 160107)
@@ -58,13 +58,14 @@
static void setPageLoaderClient(WKPageRef page, const void* clientInfo)
{
- WKPageLoaderClient loaderClient;
+ WKPageLoaderClientV3 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
+ loaderClient.base.version = 3;
+ loaderClient.base.clientInfo = clientInfo;
loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
- loaderClient.clientInfo = clientInfo;
- WKPageSetPageLoaderClient(page, &loaderClient);
+ WKPageSetPageLoaderClient(page, &loaderClient.base);
}
void webProcessCrashed(WKViewRef view, WKURLRef url, const void* clientInfo)
