Add array support

Author: jonahgraham

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

@@ -343,6 +343,26 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(jsc_1value_1is_1string)
 }
 #endif
 
+#ifndef NO_jsc_1value_1is_1typed_1array
+JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(jsc_1value_1is_1typed_1array)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jboolean rc = 0;
+	WebKitGTK_NATIVE_ENTER(env, that, jsc_1value_1is_1typed_1array_FUNC);
+/*
+	rc = (jboolean)jsc_value_is_typed_array(arg0);
+*/
+	{
+		WebKitGTK_LOAD_FUNCTION(fp, jsc_value_is_typed_array)
+		if (fp) {
+			rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong))fp)(arg0);
+		}
+	}
+	WebKitGTK_NATIVE_EXIT(env, that, jsc_1value_1is_1typed_1array_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_jsc_1value_1is_1undefined
 JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(jsc_1value_1is_1undefined)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -363,6 +383,50 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(jsc_1value_1is_1undefined)
 }
 #endif
 
+#ifndef NO_jsc_1value_1object_1get_1property
+JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(jsc_1value_1object_1get_1property)
+	(JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1)
+{
+	jbyte *lparg1=NULL;
+	jlong rc = 0;
+	WebKitGTK_NATIVE_ENTER(env, that, jsc_1value_1object_1get_1property_FUNC);
+	if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail;
+/*
+	rc = (jlong)jsc_value_object_get_property(arg0, lparg1);
+*/
+	{
+		WebKitGTK_LOAD_FUNCTION(fp, jsc_value_object_get_property)
+		if (fp) {
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1);
+		}
+	}
+fail:
+	if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0);
+	WebKitGTK_NATIVE_EXIT(env, that, jsc_1value_1object_1get_1property_FUNC);
+	return rc;
+}
+#endif
+
+#ifndef NO_jsc_1value_1object_1get_1property_1at_1index
+JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(jsc_1value_1object_1get_1property_1at_1index)
+	(JNIEnv *env, jclass that, jlong arg0, jint arg1)
+{
+	jlong rc = 0;
+	WebKitGTK_NATIVE_ENTER(env, that, jsc_1value_1object_1get_1property_1at_1index_FUNC);
+/*
+	rc = (jlong)jsc_value_object_get_property_at_index(arg0, arg1);
+*/
+	{
+		WebKitGTK_LOAD_FUNCTION(fp, jsc_value_object_get_property_at_index)
+		if (fp) {
+			rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1);
+		}
+	}
+	WebKitGTK_NATIVE_EXIT(env, that, jsc_1value_1object_1get_1property_1at_1index_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_jsc_1value_1to_1boolean
 JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(jsc_1value_1to_1boolean)
 	(JNIEnv *env, jclass that, jlong arg0)
@@ -403,6 +467,26 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(jsc_1value_1to_1double)
 }
 #endif
 
+#ifndef NO_jsc_1value_1to_1int32
+JNIEXPORT jint JNICALL WebKitGTK_NATIVE(jsc_1value_1to_1int32)
+	(JNIEnv *env, jclass that, jlong arg0)
+{
+	jint rc = 0;
+	WebKitGTK_NATIVE_ENTER(env, that, jsc_1value_1to_1int32_FUNC);
+/*
+	rc = (jint)jsc_value_to_int32(arg0);
+*/
+	{
+		WebKitGTK_LOAD_FUNCTION(fp, jsc_value_to_int32)
+		if (fp) {
+			rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0);
+		}
+	}
+	WebKitGTK_NATIVE_EXIT(env, that, jsc_1value_1to_1int32_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_jsc_1value_1to_1string
 JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(jsc_1value_1to_1string)
 	(JNIEnv *env, jclass that, jlong arg0)

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

@@ -39,9 +39,13 @@ typedef enum {
 	jsc_1value_1is_1number_FUNC,
 	jsc_1value_1is_1object_FUNC,
 	jsc_1value_1is_1string_FUNC,
+	jsc_1value_1is_1typed_1array_FUNC,
 	jsc_1value_1is_1undefined_FUNC,
+	jsc_1value_1object_1get_1property_FUNC,
+	jsc_1value_1object_1get_1property_1at_1index_FUNC,
 	jsc_1value_1to_1boolean_FUNC,
 	jsc_1value_1to_1double_FUNC,
+	jsc_1value_1to_1int32_FUNC,
 	jsc_1value_1to_1string_FUNC,
 	soup_1cookie_1get_1name_FUNC,
 	soup_1cookie_1get_1value_FUNC,

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

@@ -2867,8 +2867,18 @@ static Object gtk4_convertToJava(long jsc_value) {
 	} else if (WebKitGTK.jsc_value_is_null(jsc_value) || WebKitGTK.jsc_value_is_undefined(jsc_value)) {
 		return null;
 	} else if (WebKitGTK.jsc_value_is_object(jsc_value)) {
-		// TODO
-		SWT.error(SWT.ERROR_INVALID_ARGUMENT);
+		long jsc_length = WebKitGTK.jsc_value_object_get_property(jsc_value, Converter.wcsToMbcs(PROPERTY_LENGTH, true));
+		if (WebKitGTK.jsc_value_is_number(jsc_length)) {
+			int length = WebKitGTK.jsc_value_to_int32(jsc_length);
+			Object[] result = new Object[length];
+			for (int i = 0; i < length; i++) {
+				long jsc_value_at_i = WebKitGTK.jsc_value_object_get_property_at_index (jsc_value, i);
+				if (jsc_value_at_i != 0) {
+					result[i] = gtk4_convertToJava (jsc_value_at_i);
+				}
+			}
+			return result;
+		}
 	}
 
 	SWT.error(SWT.ERROR_INVALID_ARGUMENT);

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

@@ -545,6 +545,23 @@ public static final native void webkit_web_view_evaluate_javascript(long web_vie
  * @method flags=dynamic
  */
 public static final native double jsc_value_to_double(long value);
+/**
+ * @method flags=dynamic
+ */
+public static final native int jsc_value_to_int32(long value);
+/**
+ * @method flags=dynamic
+ */
+public static final native boolean jsc_value_is_typed_array(long value);
+/**
+ * @method flags=dynamic
+ */
+public static final native long jsc_value_object_get_property(long value, byte[] name);
+/**
+ * @method flags=dynamic
+ */
+public static final native long jsc_value_object_get_property_at_index(long value, int index);
+
 
 /** @method flags=dynamic */
 public static final native void webkit_web_view_stop_loading(long web_view);

tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java

@@ -2060,7 +2060,6 @@ public void test_evaluate_evaluation_failed_exception() {
  * Test the evaluate() api that returns an array of numbers. Functionality based on Snippet308.
  * Only wait till success. Otherwise timeout after 3 seconds.
  */
-@Tag("gtk4-todo")
 @Test
 public void test_evaluate_array_numbers() {
 
@@ -2100,7 +2099,6 @@ public void test_evaluate_array_numbers() {
  * Test the evaluate() api that returns an array of strings. Functionality based on Snippet308.
  * Only wait till success. Otherwise timeout after 3 seconds.
  */
-@Tag("gtk4-todo")
 @Test
 public void test_evaluate_array_strings () {
 
@@ -2140,7 +2138,6 @@ public void test_evaluate_array_strings () {
  * Test the evaluate() api that returns an array of mixed types. Functionality based on Snippet308.
  * Only wait till success. Otherwise timeout after 3 seconds.
  */
-@Tag("gtk4-todo")
 @Test
 public void test_evaluate_array_mixedTypes () {
 	final AtomicReferenceArray<Object> atomicArray = new AtomicReferenceArray<>(3);