Diff
Modified: trunk/Source/WebKit2/ChangeLog (185495 => 185496)
--- trunk/Source/WebKit2/ChangeLog 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-12 10:34:14 UTC (rev 185496)
@@ -1,3 +1,25 @@
+2015-06-12 Csaba Osztrogonác <[email protected]>
+
+ [EFL] Fix deprecated declarations warnings related to WK2 versioned structs
+ https://bugs.webkit.org/show_bug.cgi?id=145913
+
+ Reviewed by Gyuyoung Kim.
+
+ * 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/PageUIClientEfl.cpp:
+ (WebKit::PageUIClientEfl::PageUIClientEfl):
+
2015-06-11 Mark Lam <[email protected]>
WebCore::reportException() needs to be able to accept a raw thrown value in addition to Exception objects.
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp (185495 => 185496)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -43,8 +43,8 @@
: m_iconDatabase(iconDatabase)
{
WKIconDatabaseClientV1 iconDatabaseClient;
- memset(&iconDatabaseClient, 0, sizeof(WKIconDatabaseClient));
- iconDatabaseClient.base.version = kWKIconDatabaseClientCurrentVersion;
+ memset(&iconDatabaseClient, 0, sizeof(WKIconDatabaseClientV1));
+ iconDatabaseClient.base.version = 1;
iconDatabaseClient.base.clientInfo = this;
iconDatabaseClient.iconDataReadyForPageURL = iconDataReadyForPageURL;
WKIconDatabaseSetIconDatabaseClient(m_iconDatabase.get(), &iconDatabaseClient.base);
Modified: trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp (185495 => 185496)
--- trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextHistoryClientEfl.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -117,7 +117,7 @@
ASSERT(m_context);
WKContextHistoryClientV0 wkHistoryClient;
- memset(&wkHistoryClient, 0, sizeof(WKContextHistoryClient));
+ memset(&wkHistoryClient, 0, sizeof(WKContextHistoryClientV0));
wkHistoryClient.base.version = 0;
wkHistoryClient.base.clientInfo = this;
Modified: trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp (185495 => 185496)
--- trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/UIProcess/efl/ContextMenuClientEfl.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -59,7 +59,7 @@
ASSERT(pageRef);
WKPageContextMenuClientV3 contextMenuClient;
- memset(&contextMenuClient, 0, sizeof(WKPageContextMenuClient));
+ memset(&contextMenuClient, 0, sizeof(WKPageContextMenuClientV3));
contextMenuClient.base.version = 3;
contextMenuClient.base.clientInfo = this;
contextMenuClient.getContextMenuFromProposedMenu_deprecatedForUseWithV0 = 0;
Modified: trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp (185495 => 185496)
--- trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/UIProcess/efl/DownloadManagerEfl.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -134,7 +134,7 @@
memset(&m_clientCallbacks, 0, sizeof(ClientDownloadCallbacks));
WKContextDownloadClientV0 wkDownloadClient;
- memset(&wkDownloadClient, 0, sizeof(WKContextDownloadClient));
+ memset(&wkDownloadClient, 0, sizeof(WKContextDownloadClientV0));
wkDownloadClient.base.version = 0;
wkDownloadClient.base.clientInfo = this;
Modified: trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp (185495 => 185496)
--- trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/UIProcess/efl/FindClientEfl.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -59,7 +59,7 @@
ASSERT(pageRef);
WKPageFindClientV0 findClient;
- memset(&findClient, 0, sizeof(WKPageFindClient));
+ memset(&findClient, 0, sizeof(WKPageFindClientV0));
findClient.base.version = 0;
findClient.base.clientInfo = this;
findClient.didFindString = didFindString;
Modified: trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp (185495 => 185496)
--- trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/UIProcess/efl/FormClientEfl.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -54,7 +54,7 @@
ASSERT(pageRef);
WKPageFormClientV0 formClient;
- memset(&formClient, 0, sizeof(WKPageFormClient));
+ memset(&formClient, 0, sizeof(WKPageFormClientV0));
formClient.base.version = 0;
formClient.base.clientInfo = this;
formClient.willSubmitForm = willSubmitForm;
Modified: trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp (185495 => 185496)
--- trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Source/WebKit2/UIProcess/efl/PageUIClientEfl.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -53,7 +53,7 @@
ASSERT(pageRef);
WKPageUIClientV2 uiClient;
- memset(&uiClient, 0, sizeof(WKPageUIClient));
+ memset(&uiClient, 0, sizeof(WKPageUIClientV2));
uiClient.base.version = 2;
uiClient.base.clientInfo = this;
uiClient.close = close;
Modified: trunk/Tools/ChangeLog (185495 => 185496)
--- trunk/Tools/ChangeLog 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Tools/ChangeLog 2015-06-12 10:34:14 UTC (rev 185496)
@@ -1,5 +1,23 @@
2015-06-12 Csaba Osztrogonác <[email protected]>
+ [EFL] Fix deprecated declarations warnings related to WK2 versioned structs
+ https://bugs.webkit.org/show_bug.cgi?id=145913
+
+ Reviewed by Gyuyoung Kim.
+
+ * TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
+ (TestWebKitAPI::setupGeolocationProvider):
+ * TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp:
+ (TestWebKitAPI::setPageLoaderClient):
+ * TestWebKitAPI/Tests/WebKit2/UserMessage.cpp:
+ (TestWebKitAPI::WebKit2UserMessageRoundTripTest::setPageLoaderClient):
+ * WebKitTestRunner/GeolocationProviderMock.cpp:
+ (WTR::GeolocationProviderMock::GeolocationProviderMock):
+ * WebKitTestRunner/WebNotificationProvider.cpp:
+ (WTR::WebNotificationProvider::provider):
+
+2015-06-12 Csaba Osztrogonác <[email protected]>
+
Fix the libusrsctp build with clang
https://bugs.webkit.org/show_bug.cgi?id=145128
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp (185495 => 185496)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -106,7 +106,7 @@
void setupGeolocationProvider(WKContextRef context, void *clientInfo)
{
WKGeolocationProviderV1 providerCallback;
- memset(&providerCallback, 0, sizeof(WKGeolocationProvider));
+ memset(&providerCallback, 0, sizeof(WKGeolocationProviderV1));
providerCallback.base.version = 1;
providerCallback.base.clientInfo = clientInfo;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp (185495 => 185496)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/NewFirstVisuallyNonEmptyLayoutFrames.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -67,7 +67,7 @@
WKPageLoaderClientV3 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
- loaderClient.base.version = kWKPageLoaderClientCurrentVersion;
+ loaderClient.base.version = 3;
loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
loaderClient.didLayout = didLayout;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp (185495 => 185496)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -81,7 +81,7 @@
WKPageLoaderClientV3 loaderClient;
memset(&loaderClient, 0, sizeof(loaderClient));
- loaderClient.base.version = kWKPageLoaderClientCurrentVersion;
+ loaderClient.base.version = 3;
loaderClient.base.clientInfo = clientInfo;
loaderClient.didFinishLoadForFrame = didFinishLoadForFrame;
Modified: trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp (185495 => 185496)
--- trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Tools/WebKitTestRunner/GeolocationProviderMock.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -52,7 +52,7 @@
m_geolocationManager = WKContextGetGeolocationManager(context);
WKGeolocationProviderV1 providerCallback;
- memset(&providerCallback, 0, sizeof(WKGeolocationProvider));
+ memset(&providerCallback, 0, sizeof(WKGeolocationProviderV1));
providerCallback.base.version = 1;
providerCallback.base.clientInfo = this;
providerCallback.startUpdating = startUpdatingCallback;
Modified: trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp (185495 => 185496)
--- trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2015-06-12 10:30:43 UTC (rev 185495)
+++ trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2015-06-12 10:34:14 UTC (rev 185496)
@@ -72,7 +72,7 @@
WKNotificationProviderV0 WebNotificationProvider::provider()
{
WKNotificationProviderV0 notificationProvider = {
- { kWKNotificationProviderCurrentVersion, this },
+ { 0, this },
WTR::showWebNotification,
WTR::closeWebNotification,
0, // didDestroyNotification
