[GTK4] Update to new API for cookies in GTK4

Cookies are attached to default session now instead of default
context.

The constant WEBKIT_WEBSITE_DATA_COOKIES changed values between
GTK3 + GTK4 (technically between webkit2gtk 4 and webkitgtk 6)

Author: jonahgraham

bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c

@@ -1245,6 +1245,26 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(webkit_1navigation_1policy_1decision_1g
 }
 #endif
 
+#ifndef NO_webkit_1network_1session_1get_1cookie_1manager
+JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(webkit_1network_1session_1get_1cookie_1manager)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jlong rc = 0;
+	WebKitGTK_NATIVE_ENTER(env, that, webkit_1network_1session_1get_1cookie_1manager_FUNC);
+/*
+	rc = (jlong)webkit_network_session_get_cookie_manager(arg0);
+*/
+	{
+		WebKitGTK_LOAD_FUNCTION(fp, webkit_network_session_get_cookie_manager)
+		if (fp) {
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0);
+		}
+	}
+	WebKitGTK_NATIVE_EXIT(env, that, webkit_1network_1session_1get_1cookie_1manager_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_webkit_1network_1session_1get_1default
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(webkit_1network_1session_1get_1default)
 	(JNIEnv *env, jclass that)
@@ -1265,6 +1285,26 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(webkit_1network_1session_1get_1default)
 }
 #endif
 
+#ifndef NO_webkit_1network_1session_1get_1website_1data_1manager
+JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(webkit_1network_1session_1get_1website_1data_1manager)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jlong rc = 0;
+	WebKitGTK_NATIVE_ENTER(env, that, webkit_1network_1session_1get_1website_1data_1manager_FUNC);
+/*
+	rc = (jlong)webkit_network_session_get_website_data_manager(arg0);
+*/
+	{
+		WebKitGTK_LOAD_FUNCTION(fp, webkit_network_session_get_website_data_manager)
+		if (fp) {
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0);
+		}
+	}
+	WebKitGTK_NATIVE_EXIT(env, that, webkit_1network_1session_1get_1website_1data_1manager_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_webkit_1policy_1decision_1download
 JNIEXPORT void JNICALL WebKitGTK_NATIVE(webkit_1policy_1decision_1download)
 	(JNIEnv *env, jclass that, jlong arg0)

bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h

@@ -83,7 +83,9 @@ typedef enum {
 	webkit_1javascript_1result_1get_1value_FUNC,
 	webkit_1javascript_1result_1unref_FUNC,
 	webkit_1navigation_1policy_1decision_1get_1request_FUNC,
+	webkit_1network_1session_1get_1cookie_1manager_FUNC,
 	webkit_1network_1session_1get_1default_FUNC,
+	webkit_1network_1session_1get_1website_1data_1manager_FUNC,
 	webkit_1policy_1decision_1download_FUNC,
 	webkit_1policy_1decision_1ignore_FUNC,
 	webkit_1response_1policy_1decision_1get_1request_FUNC,

bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java

@@ -224,7 +224,11 @@ class WebKit extends WebBrowser {
 
 			NativeClearSessions = () -> {
 				if (!WebKitGTK.LibraryLoaded) return;
-				if (WebKitGTK.webkit_get_minor_version() >= 16) {
+				if (GTK.GTK4) {
+					long session = WebKitGTK.webkit_network_session_get_default();
+					long manager = WebKitGTK.webkit_network_session_get_website_data_manager(session);
+					WebKitGTK.webkit_website_data_manager_clear(manager, 64, 0, 0, 0, 0);
+				} else if (WebKitGTK.webkit_get_minor_version() >= 16) {
 					long context = WebKitGTK.webkit_web_context_get_default();
 					long manager = WebKitGTK.webkit_web_context_get_website_data_manager (context);
 					WebKitGTK.webkit_website_data_manager_clear(manager, WebKitGTK.WEBKIT_WEBSITE_DATA_COOKIES, 0, 0, 0, 0);
@@ -1159,8 +1163,14 @@ static void setCookieBrowser (Browser toSet) {
 	}
 
 	static boolean setCookie(String cookieUrl, String cookieValue) {
-		long context = WebKitGTK.webkit_web_context_get_default();
-		long cookieManager = WebKitGTK.webkit_web_context_get_cookie_manager(context);
+		long cookieManager;
+		if (GTK.GTK4) {
+			long session = WebKitGTK.webkit_network_session_get_default();
+			cookieManager = WebKitGTK.webkit_network_session_get_cookie_manager(session);
+		} else {
+			long context = WebKitGTK.webkit_web_context_get_default();
+			cookieManager = WebKitGTK.webkit_web_context_get_cookie_manager(context);
+		}
 		byte[] bytes = Converter.wcsToMbcs (cookieUrl, true);
 		long uri;
 		if (WebKitGTK.soup_get_major_version()==2) {
@@ -1230,8 +1240,14 @@ private static void setCookie_callback(long cookieManager, long result, long use
 	}
 
 	static String getCookie(String cookieUrl, String cookieName) {
-		long context = WebKitGTK.webkit_web_context_get_default();
-		long cookieManager = WebKitGTK.webkit_web_context_get_cookie_manager(context);
+		long cookieManager;
+		if (GTK.GTK4) {
+			long session = WebKitGTK.webkit_network_session_get_default();
+			cookieManager = WebKitGTK.webkit_network_session_get_cookie_manager(session);
+		} else {
+			long context = WebKitGTK.webkit_web_context_get_default();
+			cookieManager = WebKitGTK.webkit_web_context_get_cookie_manager(context);
+		}
 		byte[] uri = Converter.wcsToMbcs (cookieUrl, true);
 		if (nonBlockingEvaluate > 0) {
 			System.err.println("SWT Webkit: getCookie() called inside a synchronous callback, which can lead to a deadlock.\n"

bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java

@@ -85,7 +85,7 @@ public class WebKitGTK extends C {
 	public static final int G_TLS_CERTIFICATE_GENERIC_ERROR = 6;
 	public static final int G_TLS_CERTIFICATE_VALIDATE_ALL = 7;
 
-	public static final int WEBKIT_WEBSITE_DATA_COOKIES = 1 << 8;
+	public static final int WEBKIT_WEBSITE_DATA_COOKIES = GTK.GTK4 ? 64 : 1 << 8;
 
 	public static final int WEBKIT_USER_SCRIPT_INJECT_AT_DOCUMENT_START = 0;
 	public static final int WEBKIT_USER_CONTENT_INJECT_TOP_FRAME = 1;
@@ -365,6 +365,12 @@ public class WebKitGTK extends C {
 /** @method flags=dynamic */
 public static final native long webkit_network_session_get_default();
 
+/** @method flags=dynamic */
+public static final native long webkit_network_session_get_cookie_manager(long session);
+
+/** @method flags=dynamic */
+public static final native long webkit_network_session_get_website_data_manager(long session);
+
 /** @method flags=dynamic */
 public static final native long webkit_web_context_get_cookie_manager(long context);