Title: [170002] trunk/Source/WebKit2
- Revision
- 170002
- Author
- [email protected]
- Date
- 2014-06-16 00:25:31 -0700 (Mon, 16 Jun 2014)
Log Message
Unreviewed build fixes for the EFL and GTK+ ports after r169994 and 170000.
* UIProcess/API/C/WKPluginSiteDataManager.cpp: Undefine the None macro under X11.
* UIProcess/API/gtk/WebKitCookieManager.cpp:
(webkit_cookie_manager_get_accept_policy): Remove unnecessary ::create() wrappings.
(webkit_cookie_manager_get_domains_with_cookies): Ditto.
* UIProcess/API/gtk/WebKitWebResource.cpp:
(webkit_web_resource_get_data): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (170001 => 170002)
--- trunk/Source/WebKit2/ChangeLog 2014-06-16 06:54:08 UTC (rev 170001)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-16 07:25:31 UTC (rev 170002)
@@ -1,3 +1,14 @@
+2014-06-16 Zan Dobersek <[email protected]>
+
+ Unreviewed build fixes for the EFL and GTK+ ports after r169994 and 170000.
+
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp: Undefine the None macro under X11.
+ * UIProcess/API/gtk/WebKitCookieManager.cpp:
+ (webkit_cookie_manager_get_accept_policy): Remove unnecessary ::create() wrappings.
+ (webkit_cookie_manager_get_domains_with_cookies): Ditto.
+ * UIProcess/API/gtk/WebKitWebResource.cpp:
+ (webkit_web_resource_get_data): Ditto.
+
2014-06-15 Dan Bernstein <[email protected]>
Part 1 of Change GenericCallback<> function parameters into std::function<>
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (170001 => 170002)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-16 06:54:08 UTC (rev 170001)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-16 07:25:31 UTC (rev 170002)
@@ -32,7 +32,10 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
#include <WebCore/npapi.h>
+#if defined(MOZ_X11)
+#undef None
#endif
+#endif
using namespace WebKit;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (170001 => 170002)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2014-06-16 06:54:08 UTC (rev 170001)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2014-06-16 07:25:31 UTC (rev 170002)
@@ -211,7 +211,7 @@
g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
GTask* task = g_task_new(manager, cancellable, callback, userData);
- manager->priv->webCookieManager->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyCallback::create(toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(task, webkitCookieManagerGetAcceptPolicyCallback)));
+ manager->priv->webCookieManager->getHTTPCookieAcceptPolicy(toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(task, webkitCookieManagerGetAcceptPolicyCallback));
}
/**
@@ -269,7 +269,7 @@
g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
GTask* task = g_task_new(manager, cancellable, callback, userData);
- manager->priv->webCookieManager->getHostnamesWithCookies(ArrayCallback::create(toGenericCallbackFunction(task, webkitCookieManagerGetDomainsWithCookiesCallback)));
+ manager->priv->webCookieManager->getHostnamesWithCookies(toGenericCallbackFunction(task, webkitCookieManagerGetDomainsWithCookiesCallback));
}
/**
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (170001 => 170002)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-06-16 06:54:08 UTC (rev 170001)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2014-06-16 07:25:31 UTC (rev 170002)
@@ -340,14 +340,14 @@
GTask* task = g_task_new(resource, cancellable, callback, userData);
g_task_set_task_data(task, createResourceGetDataAsyncData(), reinterpret_cast<GDestroyNotify>(destroyResourceGetDataAsyncData));
if (resource->priv->isMainResource)
- resource->priv->frame->getMainResourceData(DataCallback::create([task](API::Data* data, CallbackBase::Error) {
+ resource->priv->frame->getMainResourceData([task](API::Data* data, CallbackBase::Error) {
resourceDataCallback(data, adoptGRef(task).get());
- }));
+ });
else {
String url = ""
- resource->priv->frame->getResourceData(API::URL::create(url).get(), DataCallback::create([task](API::Data* data, CallbackBase::Error) {
+ resource->priv->frame->getResourceData(API::URL::create(url).get(), [task](API::Data* data, CallbackBase::Error) {
resourceDataCallback(data, adoptGRef(task).get());
- }));
+ });
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
