Title: [218062] trunk/Source/WebKit2
- Revision
- 218062
- Author
- [email protected]
- Date
- 2017-06-10 23:25:45 -0700 (Sat, 10 Jun 2017)
Log Message
[GTK] Use a lambda in webkit_cookie_manager_get_accept_policy instead of toGenericCallbackFunction
https://bugs.webkit.org/show_bug.cgi?id=173134
Reviewed by Žan Doberšek.
It's simpler and easier to read.
* UIProcess/API/gtk/WebKitCookieManager.cpp:
(webkit_cookie_manager_get_accept_policy):
(webkitCookieManagerGetAcceptPolicyCallback): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (218061 => 218062)
--- trunk/Source/WebKit2/ChangeLog 2017-06-11 02:16:17 UTC (rev 218061)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-11 06:25:45 UTC (rev 218062)
@@ -1,3 +1,16 @@
+2017-06-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Use a lambda in webkit_cookie_manager_get_accept_policy instead of toGenericCallbackFunction
+ https://bugs.webkit.org/show_bug.cgi?id=173134
+
+ Reviewed by Žan Doberšek.
+
+ It's simpler and easier to read.
+
+ * UIProcess/API/gtk/WebKitCookieManager.cpp:
+ (webkit_cookie_manager_get_accept_policy):
+ (webkitCookieManagerGetAcceptPolicyCallback): Deleted.
+
2017-06-10 Dan Bernstein <[email protected]>
Reverted r218056 because it made the IDE reindex constantly.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (218061 => 218062)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2017-06-11 02:16:17 UTC (rev 218061)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2017-06-11 06:25:45 UTC (rev 218062)
@@ -182,12 +182,6 @@
processPool->supplement<WebCookieManagerProxy>()->setHTTPCookieAcceptPolicy(WebCore::SessionID::defaultSessionID(), toHTTPCookieAcceptPolicy(policy), [](CallbackBase::Error){});
}
-static void webkitCookieManagerGetAcceptPolicyCallback(WKHTTPCookieAcceptPolicy policy, WKErrorRef, void* context)
-{
- GRefPtr<GTask> task = adoptGRef(G_TASK(context));
- g_task_return_int(task.get(), toWebKitCookieAcceptPolicy(toHTTPCookieAcceptPolicy(policy)));
-}
-
/**
* webkit_cookie_manager_get_accept_policy:
* @cookie_manager: a #WebKitCookieManager
@@ -213,8 +207,9 @@
return;
}
- processPools[0]->supplement<WebCookieManagerProxy>()->getHTTPCookieAcceptPolicy(WebCore::SessionID::defaultSessionID(),
- toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(task.leakRef(), webkitCookieManagerGetAcceptPolicyCallback));
+ processPools[0]->supplement<WebCookieManagerProxy>()->getHTTPCookieAcceptPolicy(WebCore::SessionID::defaultSessionID(), [task = WTFMove(task)](HTTPCookieAcceptPolicy policy, CallbackBase::Error) {
+ g_task_return_int(task.get(), toWebKitCookieAcceptPolicy(policy));
+ });
}
/**
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes