diff options
| author | Eric Williams | 2019-03-26 14:02:00 +0000 |
|---|---|---|
| committer | Eric Williams | 2019-03-26 18:00:30 +0000 |
| commit | 4ce8a195ba3ace07f48c5d2da637f513a3e56db9 (patch) | |
| tree | 349a6ab65a4d6f84fdf42f4586a9fbd4d7143552 /bundles/org.eclipse.swt/Eclipse SWT WebKit | |
| parent | 1e2e1e226eceeee889f564c1f3edfae534aab204 (diff) | |
| download | eclipse.platform.swt-4ce8a195ba3ace07f48c5d2da637f513a3e56db9.tar.gz eclipse.platform.swt-4ce8a195ba3ace07f48c5d2da637f513a3e56db9.tar.xz eclipse.platform.swt-4ce8a195ba3ace07f48c5d2da637f513a3e56db9.zip | |
Bug 545793: [GTK] Remove 32-bit code
Remove /*int*/ casts.
Change-Id: I9e8da81d6435312acdd06cd1b3e471275ca842a8
Signed-off-by: Eric Williams <ericwill@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit')
6 files changed, 1167 insertions, 1167 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c index 686437b6e5..985d6a9e97 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2018 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -49,18 +49,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(JSClassDefinition_1sizeof) #endif #ifndef NO__1JSClassCreate -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSClassCreate_FUNC); /* - rc = (jintLong)JSClassCreate(arg0); + rc = (jlong)JSClassCreate(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSClassCreate) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSClassCreate_FUNC); @@ -69,18 +69,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) #endif #ifndef NO__1JSContextGetGlobalObject -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSContextGetGlobalObject_FUNC); /* - rc = (jintLong)JSContextGetGlobalObject(arg0); + rc = (jlong)JSContextGetGlobalObject(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSContextGetGlobalObject) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSContextGetGlobalObject_FUNC); @@ -89,20 +89,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) #endif #ifndef NO__1JSEvaluateScript -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintLongArray arg5) { jintLong *lparg5=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSEvaluateScript_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSEvaluateScript(arg0, arg1, arg2, arg3, arg4, lparg5); + rc = (jlong)JSEvaluateScript(arg0, arg1, arg2, arg3, arg4, lparg5); */ { WebKitGTK_LOAD_FUNCTION(fp, JSEvaluateScript) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); } } fail: @@ -113,18 +113,18 @@ fail: #endif #ifndef NO__1JSObjectGetPrivate -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPrivate_FUNC); /* - rc = (jintLong)JSObjectGetPrivate(arg0); + rc = (jlong)JSObjectGetPrivate(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPrivate) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPrivate_FUNC); @@ -133,20 +133,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) #endif #ifndef NO__1JSObjectGetProperty -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jintLongArray arg3) { jintLong *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetProperty_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSObjectGetProperty(arg0, arg1, arg2, lparg3); + rc = (jlong)JSObjectGetProperty(arg0, arg1, arg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetProperty) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong *))fp)(arg0, arg1, arg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong, jintLong *))fp)(arg0, arg1, arg2, lparg3); } } fail: @@ -157,20 +157,20 @@ fail: #endif #ifndef NO__1JSObjectGetPropertyAtIndex -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2, jintLongArray arg3) { jintLong *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPropertyAtIndex_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSObjectGetPropertyAtIndex(arg0, arg1, arg2, lparg3); + rc = (jlong)JSObjectGetPropertyAtIndex(arg0, arg1, arg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPropertyAtIndex) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, lparg3); } } fail: @@ -181,18 +181,18 @@ fail: #endif #ifndef NO__1JSObjectMake -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMake_FUNC); /* - rc = (jintLong)JSObjectMake(arg0, arg1, arg2); + rc = (jlong)JSObjectMake(arg0, arg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectMake) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMake_FUNC); @@ -201,22 +201,22 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) #endif #ifndef NO__1JSObjectMakeArray -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jintLongArray arg3) { jintLong *lparg2=NULL; jintLong *lparg3=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeArray_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSObjectMakeArray(arg0, arg1, lparg2, lparg3); + rc = (jlong)JSObjectMakeArray(arg0, arg1, lparg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeArray) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3); } } fail: @@ -228,18 +228,18 @@ fail: #endif #ifndef NO__1JSObjectMakeFunctionWithCallback -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); /* - rc = (jintLong)JSObjectMakeFunctionWithCallback(arg0, arg1, arg2); + rc = (jlong)JSObjectMakeFunctionWithCallback(arg0, arg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeFunctionWithCallback) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); @@ -249,7 +249,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) #ifndef NO__1JSObjectSetProperty JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jint arg4, jintLongArray arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jint arg4, jintLongArray arg5) { jintLong *lparg5=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectSetProperty_FUNC); @@ -260,7 +260,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty) { WebKitGTK_LOAD_FUNCTION(fp, JSObjectSetProperty) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); + ((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jint, jintLong *))fp)(arg0, arg1, arg2, arg3, arg4, lparg5); } } fail: @@ -270,20 +270,20 @@ fail: #endif #ifndef NO__1JSStringCreateWithUTF8CString -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringCreateWithUTF8CString_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSStringCreateWithUTF8CString(lparg0); + rc = (jlong)JSStringCreateWithUTF8CString(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringCreateWithUTF8CString) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -294,18 +294,18 @@ fail: #endif #ifndef NO__1JSStringGetLength -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetLength_FUNC); /* - rc = (jintLong)JSStringGetLength(arg0); + rc = (jlong)JSStringGetLength(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringGetLength) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetLength_FUNC); @@ -314,18 +314,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) #endif #ifndef NO__1JSStringGetMaximumUTF8CStringSize -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); /* - rc = (jintLong)JSStringGetMaximumUTF8CStringSize(arg0); + rc = (jlong)JSStringGetMaximumUTF8CStringSize(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringGetMaximumUTF8CStringSize) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); @@ -334,20 +334,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) #endif #ifndef NO__1JSStringGetUTF8CString -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2) { jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSStringGetUTF8CString(arg0, lparg1, arg2); + rc = (jlong)JSStringGetUTF8CString(arg0, lparg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSStringGetUTF8CString) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong))fp)(arg0, lparg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jbyte *, jlong))fp)(arg0, lparg1, arg2); } } fail: @@ -359,7 +359,7 @@ fail: #ifndef NO__1JSStringIsEqualToUTF8CString JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; jint rc = 0; @@ -371,7 +371,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString) { WebKitGTK_LOAD_FUNCTION(fp, JSStringIsEqualToUTF8CString) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -383,7 +383,7 @@ fail: #ifndef NO__1JSStringRelease JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1JSStringRelease_FUNC); /* @@ -392,7 +392,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) { WebKitGTK_LOAD_FUNCTION(fp, JSStringRelease) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringRelease_FUNC); @@ -401,7 +401,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) #ifndef NO__1JSValueGetType JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueGetType_FUNC); @@ -411,7 +411,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) { WebKitGTK_LOAD_FUNCTION(fp, JSValueGetType) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueGetType_FUNC); @@ -421,7 +421,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) #ifndef NO__1JSValueIsObjectOfClass JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueIsObjectOfClass_FUNC); @@ -431,7 +431,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) { WebKitGTK_LOAD_FUNCTION(fp, JSValueIsObjectOfClass) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jlong, jlong))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueIsObjectOfClass_FUNC); @@ -440,18 +440,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) #endif #ifndef NO__1JSValueMakeBoolean -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeBoolean_FUNC); /* - rc = (jintLong)JSValueMakeBoolean(arg0, arg1); + rc = (jlong)JSValueMakeBoolean(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeBoolean) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeBoolean_FUNC); @@ -460,18 +460,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) #endif #ifndef NO__1JSValueMakeNumber -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) - (JNIEnv *env, jclass that, jintLong arg0, jdouble arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) + (JNIEnv *env, jclass that, jlong arg0, jdouble arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeNumber_FUNC); /* - rc = (jintLong)JSValueMakeNumber(arg0, arg1); + rc = (jlong)JSValueMakeNumber(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeNumber) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jdouble))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jdouble))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeNumber_FUNC); @@ -480,18 +480,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) #endif #ifndef NO__1JSValueMakeString -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeString_FUNC); /* - rc = (jintLong)JSValueMakeString(arg0, arg1); + rc = (jlong)JSValueMakeString(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeString) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeString_FUNC); @@ -500,18 +500,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) #endif #ifndef NO__1JSValueMakeUndefined -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeUndefined_FUNC); /* - rc = (jintLong)JSValueMakeUndefined(arg0); + rc = (jlong)JSValueMakeUndefined(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeUndefined) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeUndefined_FUNC); @@ -521,7 +521,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) #ifndef NO__1JSValueToNumber JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; jdouble rc = 0; @@ -533,7 +533,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber) { WebKitGTK_LOAD_FUNCTION(fp, JSValueToNumber) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong, jlong, jintLong *))fp)(arg0, arg1, lparg2); } } fail: @@ -544,20 +544,20 @@ fail: #endif #ifndef NO__1JSValueToStringCopy -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToStringCopy_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; /* - rc = (jintLong)JSValueToStringCopy(arg0, arg1, lparg2); + rc = (jlong)JSValueToStringCopy(arg0, arg1, lparg2); */ { WebKitGTK_LOAD_FUNCTION(fp, JSValueToStringCopy) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *))fp)(arg0, arg1, lparg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *))fp)(arg0, arg1, lparg2); } } fail: @@ -568,12 +568,12 @@ fail: #endif #ifndef NO__1SoupCookie_1expires -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1SoupCookie_1expires_FUNC); - rc = (jintLong)((SoupCookie *)arg0)->expires; + rc = (jlong)((SoupCookie *)arg0)->expires; WebKitGTK_NATIVE_EXIT(env, that, _1SoupCookie_1expires_FUNC); return rc; } @@ -581,7 +581,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) #ifndef NO__1SoupMessage_1method JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1SoupMessage_1method) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1SoupMessage_1method_FUNC); ((SoupMessage *)arg0)->method = ((const char *)arg1); @@ -590,24 +590,24 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1SoupMessage_1method) #endif #ifndef NO__1SoupMessage_1request_1body -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1body) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1body) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1SoupMessage_1request_1body_FUNC); - rc = (jintLong)((SoupMessage *)arg0)->request_body; + rc = (jlong)((SoupMessage *)arg0)->request_body; WebKitGTK_NATIVE_EXIT(env, that, _1SoupMessage_1request_1body_FUNC); return rc; } #endif #ifndef NO__1SoupMessage_1request_1headers -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1SoupMessage_1request_1headers_FUNC); - rc = (jintLong)((SoupMessage *)arg0)->request_headers; + rc = (jlong)((SoupMessage *)arg0)->request_headers; WebKitGTK_NATIVE_EXIT(env, that, _1SoupMessage_1request_1headers_FUNC); return rc; } @@ -615,7 +615,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) #ifndef NO__1soup_1auth_1authenticate JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -628,7 +628,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) { WebKitGTK_LOAD_FUNCTION(fp, soup_auth_authenticate) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); } } fail: @@ -639,18 +639,18 @@ fail: #endif #ifndef NO__1soup_1auth_1get_1host -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1host_FUNC); /* - rc = (jintLong)soup_auth_get_host(arg0); + rc = (jlong)soup_auth_get_host(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_host) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1host_FUNC); @@ -659,18 +659,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) #endif #ifndef NO__1soup_1auth_1get_1scheme_1name -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); /* - rc = (jintLong)soup_auth_get_scheme_name(arg0); + rc = (jlong)soup_auth_get_scheme_name(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_scheme_name) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); @@ -680,7 +680,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) #ifndef NO__1soup_1cookie_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1free_FUNC); /* @@ -689,7 +689,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1free) { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_free) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1free_FUNC); @@ -698,7 +698,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1free) #ifndef NO__1soup_1cookie_1jar_1add_1cookie JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); /* @@ -707,7 +707,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_add_cookie) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); @@ -715,18 +715,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) #endif #ifndef NO__1soup_1cookie_1jar_1all_1cookies -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); /* - rc = (jintLong)soup_cookie_jar_all_cookies(arg0); + rc = (jlong)soup_cookie_jar_all_cookies(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_all_cookies) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); @@ -736,7 +736,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) #ifndef NO__1soup_1cookie_1jar_1delete_1cookie JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); /* @@ -745,7 +745,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_delete_cookie) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); @@ -753,18 +753,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) #endif #ifndef NO__1soup_1cookie_1jar_1get_1cookies -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jint arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jint arg2) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); /* - rc = (jintLong)soup_cookie_jar_get_cookies(arg0, arg1, arg2); + rc = (jlong)soup_cookie_jar_get_cookies(arg0, arg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_cookies) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jint))fp)(arg0, arg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jint))fp)(arg0, arg1, arg2); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); @@ -773,18 +773,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) #endif #ifndef NO__1soup_1cookie_1jar_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); /* - rc = (jintLong)soup_cookie_jar_get_type(); + rc = (jlong)soup_cookie_jar_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); @@ -793,20 +793,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) #endif #ifndef NO__1soup_1cookie_1parse -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse) - (JNIEnv *env, jclass that, jbyteArray arg0, jintLong arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse) + (JNIEnv *env, jclass that, jbyteArray arg0, jlong arg1) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1parse_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)soup_cookie_parse(lparg0, arg1); + rc = (jlong)soup_cookie_parse(lparg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_parse) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jintLong))fp)(lparg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *, jlong))fp)(lparg0, arg1); } } fail: @@ -818,7 +818,7 @@ fail: #ifndef NO__1soup_1message_1body_1append JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jint arg1, jlong arg2, jlong arg3) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1append_FUNC); /* @@ -827,7 +827,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) { WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_append) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); + ((void (CALLING_CONVENTION*)(jlong, jint, jlong, jlong))fp)(arg0, arg1, arg2, arg3); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1append_FUNC); @@ -836,7 +836,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) #ifndef NO__1soup_1message_1body_1flatten JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1flatten_FUNC); /* @@ -845,7 +845,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) { WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_flatten) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1flatten_FUNC); @@ -853,18 +853,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) #endif #ifndef NO__1soup_1message_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1get_1uri_FUNC); /* - rc = (jintLong)soup_message_get_uri(arg0); + rc = (jlong)soup_message_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_message_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1get_1uri_FUNC); @@ -874,7 +874,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) #ifndef NO__1soup_1message_1headers_1append JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -887,7 +887,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append) { WebKitGTK_LOAD_FUNCTION(fp, soup_message_headers_append) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); } } fail: @@ -899,7 +899,7 @@ fail: #ifndef NO__1soup_1session_1add_1feature_1by_1type JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); /* @@ -908,7 +908,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) { WebKitGTK_LOAD_FUNCTION(fp, soup_session_add_feature_by_type) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); @@ -917,7 +917,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) #ifndef NO__1soup_1session_1feature_1attach JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1attach_FUNC); /* @@ -926,7 +926,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) { WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_attach) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1attach_FUNC); @@ -935,7 +935,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) #ifndef NO__1soup_1session_1feature_1detach JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1detach_FUNC); /* @@ -944,7 +944,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) { WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_detach) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1detach_FUNC); @@ -952,18 +952,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) #endif #ifndef NO__1soup_1session_1get_1feature -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC); /* - rc = (jintLong)soup_session_get_feature(arg0, arg1); + rc = (jlong)soup_session_get_feature(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_feature) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1feature_FUNC); @@ -972,18 +972,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) #endif #ifndef NO__1soup_1session_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1type_FUNC); /* - rc = (jintLong)soup_session_get_type(); + rc = (jlong)soup_session_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1type_FUNC); @@ -993,7 +993,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) #ifndef NO__1soup_1uri_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1free_FUNC); /* @@ -1002,7 +1002,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) { WebKitGTK_LOAD_FUNCTION(fp, soup_uri_free) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1free_FUNC); @@ -1010,20 +1010,20 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) #endif #ifndef NO__1soup_1uri_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)soup_uri_new(lparg0); + rc = (jlong)soup_uri_new(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_uri_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -1034,18 +1034,18 @@ fail: #endif #ifndef NO__1soup_1uri_1to_1string -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1to_1string_FUNC); /* - rc = (jintLong)soup_uri_to_string(arg0, arg1); + rc = (jlong)soup_uri_to_string(arg0, arg1); */ { WebKitGTK_LOAD_FUNCTION(fp, soup_uri_to_string) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1to_1string_FUNC); @@ -1055,7 +1055,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) #ifndef NO__1webkit_1authentication_1request_1authenticate JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1authenticate) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1authentication_1request_1authenticate_FUNC); /* @@ -1064,7 +1064,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1authe { WebKitGTK_LOAD_FUNCTION(fp, webkit_authentication_request_authenticate) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1authentication_1request_1authenticate_FUNC); @@ -1073,7 +1073,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1authe #ifndef NO__1webkit_1authentication_1request_1cancel JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1cancel) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1authentication_1request_1cancel_FUNC); /* @@ -1082,7 +1082,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1cance { WebKitGTK_LOAD_FUNCTION(fp, webkit_authentication_request_cancel) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1authentication_1request_1cancel_FUNC); @@ -1091,7 +1091,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1cance #ifndef NO__1webkit_1authentication_1request_1is_1retry JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1is_1retry) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1authentication_1request_1is_1retry_FUNC); @@ -1101,7 +1101,7 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1i { WebKitGTK_LOAD_FUNCTION(fp, webkit_authentication_request_is_retry) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1authentication_1request_1is_1retry_FUNC); @@ -1111,7 +1111,7 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1authentication_1request_1i #ifndef NO__1webkit_1credential_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1free) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1credential_1free_FUNC); /* @@ -1120,7 +1120,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1free) { WebKitGTK_LOAD_FUNCTION(fp, webkit_credential_free) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1credential_1free_FUNC); @@ -1128,22 +1128,22 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1free) #endif #ifndef NO__1webkit_1credential_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1credential_1new) (JNIEnv *env, jclass that, jbyteArray arg0, jbyteArray arg1, jint arg2) { jbyte *lparg0=NULL; jbyte *lparg1=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1credential_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_credential_new(lparg0, lparg1, arg2); + rc = (jlong)webkit_credential_new(lparg0, lparg1, arg2); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_credential_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *, jbyte *, jint))fp)(lparg0, lparg1, arg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *, jbyte *, jint))fp)(lparg0, lparg1, arg2); } } fail: @@ -1156,7 +1156,7 @@ fail: #ifndef NO__1webkit_1dom_1event_1target_1add_1event_1listener JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1event_1target_1add_1event_1listener) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jint arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jint arg3, jlong arg4) { jbyte *lparg1=NULL; jint rc = 0; @@ -1168,7 +1168,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1event_1target_1add_1event { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_event_target_add_event_listener) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jint, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jbyte *, jlong, jint, jlong))fp)(arg0, lparg1, arg2, arg3, arg4); } } fail: @@ -1180,7 +1180,7 @@ fail: #ifndef NO__1webkit_1dom_1mouse_1event_1get_1alt_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1alt_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1alt_1key_FUNC); @@ -1190,7 +1190,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1alt_1k { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_alt_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1alt_1key_FUNC); @@ -1200,7 +1200,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1alt_1k #ifndef NO__1webkit_1dom_1mouse_1event_1get_1button JNIEXPORT jshort JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1button) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jshort rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1button_FUNC); @@ -1210,7 +1210,7 @@ JNIEXPORT jshort JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1butt { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_button) if (fp) { - rc = (jshort)((jshort (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jshort)((jshort (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1button_FUNC); @@ -1220,7 +1220,7 @@ JNIEXPORT jshort JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1butt #ifndef NO__1webkit_1dom_1mouse_1event_1get_1ctrl_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1ctrl_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1ctrl_1key_FUNC); @@ -1230,7 +1230,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1ctrl_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_ctrl_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1ctrl_1key_FUNC); @@ -1240,7 +1240,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1ctrl_1 #ifndef NO__1webkit_1dom_1mouse_1event_1get_1meta_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1meta_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1meta_1key_FUNC); @@ -1250,7 +1250,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1meta_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_meta_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1meta_1key_FUNC); @@ -1260,7 +1260,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1meta_1 #ifndef NO__1webkit_1dom_1mouse_1event_1get_1screen_1x JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1screen_1x) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1x_FUNC); @@ -1270,7 +1270,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_screen_x) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1x_FUNC); @@ -1280,7 +1280,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree #ifndef NO__1webkit_1dom_1mouse_1event_1get_1screen_1y JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1screen_1y) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1y_FUNC); @@ -1290,7 +1290,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_screen_y) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1screen_1y_FUNC); @@ -1300,7 +1300,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1scree #ifndef NO__1webkit_1dom_1mouse_1event_1get_1shift_1key JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1shift_1key) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1mouse_1event_1get_1shift_1key_FUNC); @@ -1310,7 +1310,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1shift_ { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_mouse_event_get_shift_key) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1mouse_1event_1get_1shift_1key_FUNC); @@ -1320,7 +1320,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1mouse_1event_1get_1shift_ #ifndef NO__1webkit_1dom_1ui_1event_1get_1char_1code JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1char_1code) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1char_1code_FUNC); @@ -1330,7 +1330,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1char_1co { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_char_code) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1char_1code_FUNC); @@ -1340,7 +1340,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1char_1co #ifndef NO__1webkit_1dom_1ui_1event_1get_1detail JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1detail) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1detail_FUNC); @@ -1350,7 +1350,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1detail) { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_detail) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1detail_FUNC); @@ -1360,7 +1360,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1detail) #ifndef NO__1webkit_1dom_1ui_1event_1get_1key_1code JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1key_1code) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1dom_1ui_1event_1get_1key_1code_FUNC); @@ -1370,7 +1370,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1key_1cod { WebKitGTK_LOAD_FUNCTION(fp, webkit_dom_ui_event_get_key_code) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1dom_1ui_1event_1get_1key_1code_FUNC); @@ -1380,7 +1380,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1dom_1ui_1event_1get_1key_1cod #ifndef NO__1webkit_1download_1cancel JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1cancel_FUNC); /* @@ -1389,7 +1389,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_cancel) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1cancel_FUNC); @@ -1398,7 +1398,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) #ifndef NO__1webkit_1download_1get_1current_1size JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1current_1size_FUNC); @@ -1408,7 +1408,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_current_size) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1current_1size_FUNC); @@ -1417,18 +1417,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) #endif #ifndef NO__1webkit_1download_1get_1network_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1network_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1network_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1network_1request_FUNC); /* - rc = (jintLong)webkit_download_get_network_request(arg0); + rc = (jlong)webkit_download_get_network_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_network_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1network_1request_FUNC); @@ -1438,7 +1438,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1network_1re #ifndef NO__1webkit_1download_1get_1received_1data_1length JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1received_1data_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1received_1data_1length_FUNC); @@ -1448,7 +1448,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1received_1data { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_received_data_length) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1received_1data_1length_FUNC); @@ -1457,18 +1457,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1received_1data #endif #ifndef NO__1webkit_1download_1get_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1request_FUNC); /* - rc = (jintLong)webkit_download_get_request(arg0); + rc = (jlong)webkit_download_get_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1request_FUNC); @@ -1477,18 +1477,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1request) #endif #ifndef NO__1webkit_1download_1get_1response -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1response) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1response) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1response_FUNC); /* - rc = (jintLong)webkit_download_get_response(arg0); + rc = (jlong)webkit_download_get_response(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_response) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1response_FUNC); @@ -1498,7 +1498,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1response) #ifndef NO__1webkit_1download_1get_1status JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1status_FUNC); @@ -1508,7 +1508,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_status) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1status_FUNC); @@ -1517,18 +1517,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) #endif #ifndef NO__1webkit_1download_1get_1suggested_1filename -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1filename) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1filename) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); /* - rc = (jintLong)webkit_download_get_suggested_filename(arg0); + rc = (jlong)webkit_download_get_suggested_filename(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_suggested_filename) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); @@ -1538,7 +1538,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1 #ifndef NO__1webkit_1download_1get_1total_1size JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1total_1size_FUNC); @@ -1548,7 +1548,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_total_size) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1total_1size_FUNC); @@ -1557,18 +1557,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) #endif #ifndef NO__1webkit_1download_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1type_FUNC); /* - rc = (jintLong)webkit_download_get_type(); + rc = (jlong)webkit_download_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1type_FUNC); @@ -1577,18 +1577,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1type) #endif #ifndef NO__1webkit_1download_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1uri_FUNC); /* - rc = (jintLong)webkit_download_get_uri(arg0); + rc = (jlong)webkit_download_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1uri_FUNC); @@ -1597,18 +1597,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) #endif #ifndef NO__1webkit_1download_1get_1web_1view -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1web_1view) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1web_1view) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1web_1view_FUNC); /* - rc = (jintLong)webkit_download_get_web_view(arg0); + rc = (jlong)webkit_download_get_web_view(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_web_view) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1web_1view_FUNC); @@ -1617,18 +1617,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1web_1view) #endif #ifndef NO__1webkit_1download_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1new) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1new) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1new_FUNC); /* - rc = (jintLong)webkit_download_new(arg0); + rc = (jlong)webkit_download_new(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1new_FUNC); @@ -1638,7 +1638,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1new) #ifndef NO__1webkit_1download_1set_1allow_1overwrite JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1allow_1overwrite) - (JNIEnv *env, jclass that, jintLong arg0, jboolean arg1) + (JNIEnv *env, jclass that, jlong arg0, jboolean arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1allow_1overwrite_FUNC); /* @@ -1647,7 +1647,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1allow_1overwrit { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_allow_overwrite) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jboolean))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jboolean))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1set_1allow_1overwrite_FUNC); @@ -1656,7 +1656,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1allow_1overwrit #ifndef NO__1webkit_1download_1set_1destination JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_FUNC); @@ -1667,7 +1667,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -1678,7 +1678,7 @@ fail: #ifndef NO__1webkit_1download_1set_1destination_1uri JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); @@ -1689,7 +1689,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1ur { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination_uri) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -1700,7 +1700,7 @@ fail: #ifndef NO__1webkit_1download_1start JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1start) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1start_FUNC); /* @@ -1709,7 +1709,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1start) { WebKitGTK_LOAD_FUNCTION(fp, webkit_download_start) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1start_FUNC); @@ -1718,7 +1718,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1start) #ifndef NO__1webkit_1favicon_1database_1set_1path JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1favicon_1database_1set_1path) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1favicon_1database_1set_1path_FUNC); /* @@ -1727,7 +1727,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1favicon_1database_1set_1path) { WebKitGTK_LOAD_FUNCTION(fp, webkit_favicon_database_set_path) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1favicon_1database_1set_1path_FUNC); @@ -1735,18 +1735,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1favicon_1database_1set_1path) #endif #ifndef NO__1webkit_1get_1default_1session -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1get_1default_1session_FUNC); /* - rc = (jintLong)webkit_get_default_session(); + rc = (jlong)webkit_get_default_session(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_get_default_session) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1get_1default_1session_FUNC); @@ -1755,18 +1755,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) #endif #ifndef NO__1webkit_1get_1favicon_1database -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1favicon_1database) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1favicon_1database) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1get_1favicon_1database_FUNC); /* - rc = (jintLong)webkit_get_favicon_database(); + rc = (jlong)webkit_get_favicon_database(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_get_favicon_database) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1get_1favicon_1database_FUNC); @@ -1836,7 +1836,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1get_1minor_1version) #ifndef NO__1webkit_1hit_1test_1result_1context_1is_1link JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1context_1is_1link) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jboolean rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1context_1is_1link_FUNC); @@ -1846,7 +1846,7 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1context { WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_context_is_link) if (fp) { - rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jboolean)((jboolean (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1context_1is_1link_FUNC); @@ -1855,18 +1855,18 @@ JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1context #endif #ifndef NO__1webkit_1hit_1test_1result_1get_1link_1title -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1title) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1title) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1get_1link_1title_FUNC); /* - rc = (jintLong)webkit_hit_test_result_get_link_title(arg0); + rc = (jlong)webkit_hit_test_result_get_link_title(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_get_link_title) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1get_1link_1title_FUNC); @@ -1875,18 +1875,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1li #endif #ifndef NO__1webkit_1hit_1test_1result_1get_1link_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1link_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1hit_1test_1result_1get_1link_1uri_FUNC); /* - rc = (jintLong)webkit_hit_test_result_get_link_uri(arg0); + rc = (jlong)webkit_hit_test_result_get_link_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_hit_test_result_get_link_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1hit_1test_1result_1get_1link_1uri_FUNC); @@ -1895,18 +1895,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1hit_1test_1result_1get_1li #endif #ifndef NO__1webkit_1javascript_1result_1get_1global_1context -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1global_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1global_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1javascript_1result_1get_1global_1context_FUNC); /* - rc = (jintLong)webkit_javascript_result_get_global_context((gpointer)arg0); + rc = (jlong)webkit_javascript_result_get_global_context((gpointer)arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_javascript_result_get_global_context) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1javascript_1result_1get_1global_1context_FUNC); @@ -1915,18 +1915,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1g #endif #ifndef NO__1webkit_1javascript_1result_1get_1value -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1value) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1value) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1javascript_1result_1get_1value_FUNC); /* - rc = (jintLong)webkit_javascript_result_get_value((gpointer)arg0); + rc = (jlong)webkit_javascript_result_get_value((gpointer)arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_javascript_result_get_value) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(gpointer))fp)((gpointer)arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1javascript_1result_1get_1value_FUNC); @@ -1936,7 +1936,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1get_1v #ifndef NO__1webkit_1javascript_1result_1unref JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1unref) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1javascript_1result_1unref_FUNC); /* @@ -1945,7 +1945,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1javascript_1result_1unref) { WebKitGTK_LOAD_FUNCTION(fp, webkit_javascript_result_unref) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1javascript_1result_1unref_FUNC); @@ -2013,18 +2013,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1minor_1version) #endif #ifndef NO__1webkit_1navigation_1policy_1decision_1get_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1navigation_1policy_1decision_1get_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1navigation_1policy_1decision_1get_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1navigation_1policy_1decision_1get_1request_FUNC); /* - rc = (jintLong)webkit_navigation_policy_decision_get_request(arg0); + rc = (jlong)webkit_navigation_policy_decision_get_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_navigation_policy_decision_get_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1navigation_1policy_1decision_1get_1request_FUNC); @@ -2033,18 +2033,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1navigation_1policy_1decisi #endif #ifndef NO__1webkit_1network_1request_1get_1message -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1message) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1message) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1message_FUNC); /* - rc = (jintLong)webkit_network_request_get_message(arg0); + rc = (jlong)webkit_network_request_get_message(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_message) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1message_FUNC); @@ -2053,18 +2053,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1mes #endif #ifndef NO__1webkit_1network_1request_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1uri_FUNC); /* - rc = (jintLong)webkit_network_request_get_uri(arg0); + rc = (jlong)webkit_network_request_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1uri_FUNC); @@ -2073,20 +2073,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri #endif #ifndef NO__1webkit_1network_1request_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_network_request_new(lparg0); + rc = (jlong)webkit_network_request_new(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -2098,7 +2098,7 @@ fail: #ifndef NO__1webkit_1policy_1decision_1download JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1download) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1policy_1decision_1download_FUNC); /* @@ -2107,7 +2107,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1download) { WebKitGTK_LOAD_FUNCTION(fp, webkit_policy_decision_download) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1policy_1decision_1download_FUNC); @@ -2116,7 +2116,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1download) #ifndef NO__1webkit_1policy_1decision_1ignore JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1ignore) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1policy_1decision_1ignore_FUNC); /* @@ -2125,7 +2125,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1ignore) { WebKitGTK_LOAD_FUNCTION(fp, webkit_policy_decision_ignore) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1policy_1decision_1ignore_FUNC); @@ -2133,18 +2133,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1policy_1decision_1ignore) #endif #ifndef NO__1webkit_1response_1policy_1decision_1get_1request -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1request) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1request) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1response_1policy_1decision_1get_1request_FUNC); /* - rc = (jintLong)webkit_response_policy_decision_get_request(arg0); + rc = (jlong)webkit_response_policy_decision_get_request(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_response_policy_decision_get_request) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1response_1policy_1decision_1get_1request_FUNC); @@ -2153,18 +2153,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision #endif #ifndef NO__1webkit_1response_1policy_1decision_1get_1response -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1response) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision_1get_1response) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1response_1policy_1decision_1get_1response_FUNC); /* - rc = (jintLong)webkit_response_policy_decision_get_response(arg0); + rc = (jlong)webkit_response_policy_decision_get_response(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_response_policy_decision_get_response) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1response_1policy_1decision_1get_1response_FUNC); @@ -2173,18 +2173,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1response_1policy_1decision #endif #ifndef NO__1webkit_1soup_1auth_1dialog_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); /* - rc = (jintLong)webkit_soup_auth_dialog_get_type(); + rc = (jlong)webkit_soup_auth_dialog_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_soup_auth_dialog_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); @@ -2193,18 +2193,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1t #endif #ifndef NO__1webkit_1uri_1request_1get_1http_1headers -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1http_1headers) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1http_1headers) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1request_1get_1http_1headers_FUNC); /* - rc = (jintLong)webkit_uri_request_get_http_headers(arg0); + rc = (jlong)webkit_uri_request_get_http_headers(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_request_get_http_headers) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1request_1get_1http_1headers_FUNC); @@ -2213,18 +2213,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1http_1h #endif #ifndef NO__1webkit_1uri_1request_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1request_1get_1uri_FUNC); /* - rc = (jintLong)webkit_uri_request_get_uri(arg0); + rc = (jlong)webkit_uri_request_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_request_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1request_1get_1uri_FUNC); @@ -2233,20 +2233,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1get_1uri) #endif #ifndef NO__1webkit_1uri_1request_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1request_1new) (JNIEnv *env, jclass that, jbyteArray arg0) { jbyte *lparg0=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1request_1new_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_uri_request_new(lparg0); + rc = (jlong)webkit_uri_request_new(lparg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_request_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jbyte *))fp)(lparg0); } } fail: @@ -2258,7 +2258,7 @@ fail: #ifndef NO__1webkit_1uri_1response_1get_1content_1length JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1content_1length) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1response_1get_1content_1length_FUNC); @@ -2268,7 +2268,7 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1content_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_response_get_content_length) if (fp) { - rc = (jlong)((jlong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1response_1get_1content_1length_FUNC); @@ -2277,18 +2277,18 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1content_1 #endif #ifndef NO__1webkit_1uri_1response_1get_1mime_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1mime_1type) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1mime_1type) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1uri_1response_1get_1mime_1type_FUNC); /* - rc = (jintLong)webkit_uri_response_get_mime_type(arg0); + rc = (jlong)webkit_uri_response_get_mime_type(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_uri_response_get_mime_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1uri_1response_1get_1mime_1type_FUNC); @@ -2297,20 +2297,20 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1uri_1response_1get_1mime_1 #endif #ifndef NO__1webkit_1web_1context_1allow_1tls_1certificate_1for_1host -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1allow_1tls_1certificate_1for_1host) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1allow_1tls_1certificate_1for_1host) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2) { jbyte *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1allow_1tls_1certificate_1for_1host_FUNC); if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_web_context_allow_tls_certificate_for_host(arg0, arg1, lparg2); + rc = (jlong)webkit_web_context_allow_tls_certificate_for_host(arg0, arg1, lparg2); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_allow_tls_certificate_for_host) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jbyte *))fp)(arg0, arg1, lparg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jbyte *))fp)(arg0, arg1, lparg2); } } fail: @@ -2321,18 +2321,18 @@ fail: #endif #ifndef NO__1webkit_1web_1context_1get_1default -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1default) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1default) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1get_1default_FUNC); /* - rc = (jintLong)webkit_web_context_get_default(); + rc = (jlong)webkit_web_context_get_default(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_get_default) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1get_1default_FUNC); @@ -2341,18 +2341,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1default #endif #ifndef NO__1webkit_1web_1context_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1get_1type_FUNC); /* - rc = (jintLong)webkit_web_context_get_type(); + rc = (jlong)webkit_web_context_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1get_1type_FUNC); @@ -2361,18 +2361,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1type) #endif #ifndef NO__1webkit_1web_1context_1get_1website_1data_1manager -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1website_1data_1manager) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1website_1data_1manager) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1get_1website_1data_1manager_FUNC); /* - rc = (jintLong)webkit_web_context_get_website_data_manager(arg0); + rc = (jlong)webkit_web_context_get_website_data_manager(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_get_website_data_manager) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1get_1website_1data_1manager_FUNC); @@ -2382,7 +2382,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1get_1website #ifndef NO__1webkit_1web_1context_1set_1tls_1errors_1policy JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1tls_1errors_1policy) - (JNIEnv *env, jclass that, jintLong arg0, jint arg1) + (JNIEnv *env, jclass that, jlong arg0, jint arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1set_1tls_1errors_1policy_FUNC); /* @@ -2391,7 +2391,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1tls_1errors { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_set_tls_errors_policy) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jint))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jint))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1context_1set_1tls_1errors_1policy_FUNC); @@ -2400,7 +2400,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1tls_1errors #ifndef NO__1webkit_1web_1context_1set_1web_1extensions_1directory JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extensions_1directory) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1context_1set_1web_1extensions_1directory_FUNC); @@ -2411,7 +2411,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extens { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_context_set_web_extensions_directory) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -2439,18 +2439,18 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1context_1set_1web_1extens #endif #ifndef NO__1webkit_1web_1data_1source_1get_1data -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1data) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1data) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); /* - rc = (jintLong)webkit_web_data_source_get_data(arg0); + rc = (jlong)webkit_web_data_source_get_data(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_data) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); @@ -2459,18 +2459,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1da #endif #ifndef NO__1webkit_1web_1data_1source_1get_1encoding -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1encoding) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1encoding) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); /* - rc = (jintLong)webkit_web_data_source_get_encoding(arg0); + rc = (jlong)webkit_web_data_source_get_encoding(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_encoding) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); @@ -2479,18 +2479,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1en #endif #ifndef NO__1webkit_1web_1frame_1get_1data_1source -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1source) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1source) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); /* - rc = (jintLong)webkit_web_frame_get_data_source(arg0); + rc = (jlong)webkit_web_frame_get_data_source(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_data_source) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); @@ -2499,18 +2499,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1sou #endif #ifndef NO__1webkit_1web_1frame_1get_1global_1context -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); /* - rc = (jintLong)webkit_web_frame_get_global_context(arg0); + rc = (jlong)webkit_web_frame_get_global_context(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_global_context) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); @@ -2520,7 +2520,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1c #ifndef NO__1webkit_1web_1frame_1get_1load_1status JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); @@ -2530,7 +2530,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_load_status) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); @@ -2539,18 +2539,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) #endif #ifndef NO__1webkit_1web_1frame_1get_1parent -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); /* - rc = (jintLong)webkit_web_frame_get_parent(arg0); + rc = (jlong)webkit_web_frame_get_parent(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_parent) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); @@ -2559,18 +2559,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) #endif #ifndef NO__1webkit_1web_1frame_1get_1title -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1title_FUNC); /* - rc = (jintLong)webkit_web_frame_get_title(arg0); + rc = (jlong)webkit_web_frame_get_title(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_title) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1title_FUNC); @@ -2579,18 +2579,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) #endif #ifndef NO__1webkit_1web_1frame_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1type_FUNC); /* - rc = (jintLong)webkit_web_frame_get_type(); + rc = (jlong)webkit_web_frame_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1type_FUNC); @@ -2599,18 +2599,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) #endif #ifndef NO__1webkit_1web_1frame_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); /* - rc = (jintLong)webkit_web_frame_get_uri(arg0); + rc = (jlong)webkit_web_frame_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); @@ -2619,18 +2619,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) #endif #ifndef NO__1webkit_1web_1frame_1get_1web_1view -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); /* - rc = (jintLong)webkit_web_frame_get_web_view(arg0); + rc = (jlong)webkit_web_frame_get_web_view(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_web_view) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); @@ -2640,7 +2640,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view #ifndef NO__1webkit_1web_1policy_1decision_1download JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1download) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); /* @@ -2649,7 +2649,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_download) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); @@ -2658,7 +2658,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa #ifndef NO__1webkit_1web_1policy_1decision_1ignore JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); /* @@ -2667,7 +2667,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_ignore) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); @@ -2676,7 +2676,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) #ifndef NO__1webkit_1web_1resource_1get_1data JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1resource_1get_1data_FUNC); /* @@ -2685,7 +2685,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_resource_get_data) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3); + ((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong))fp)(arg0, arg1, arg2, arg3); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1resource_1get_1data_FUNC); @@ -2693,26 +2693,26 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data) #endif #ifndef NO__1webkit_1web_1resource_1get_1data_1finish -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data_1finish) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2, jintLongArray arg3) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1resource_1get_1data_1finish) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2, jlongArray arg3) { jintLong *lparg2=NULL; - jintLong *lparg3=NULL; - jintLong rc = 0; + jlong *lparg3=NULL; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1resource_1get_1data_1finish_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; - if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; + if (arg3) if ((lparg3 = (*env)->GetLongArrayElements(env, arg3, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_web_resource_get_data_finish(arg0, arg1, lparg2, lparg3); + rc = (jlong)webkit_web_resource_get_data_finish(arg0, arg1, lparg2, lparg3); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_resource_get_data_finish) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, jintLong *, jintLong *))fp)(arg0, arg1, lparg2, lparg3); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, jintLong *, jlong *))fp)(arg0, arg1, lparg2, lparg3); } } fail: - if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); + if (arg3 && lparg3) (*env)->ReleaseLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1resource_1get_1data_1finish_FUNC); return rc; @@ -2721,7 +2721,7 @@ fail: #ifndef NO__1webkit_1web_1view_1can_1go_1back JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); @@ -2731,7 +2731,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_back) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); @@ -2741,7 +2741,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) #ifndef NO__1webkit_1web_1view_1can_1go_1forward JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); @@ -2751,7 +2751,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_forward) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); @@ -2761,7 +2761,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) #ifndef NO__1webkit_1web_1view_1can_1show_1mime_1type JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1type) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); @@ -2771,7 +2771,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_show_mime_type) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); @@ -2781,7 +2781,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty #ifndef NO__1webkit_1web_1view_1execute_1script JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1execute_1script_FUNC); @@ -2792,7 +2792,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_execute_script) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -2802,18 +2802,18 @@ fail: #endif #ifndef NO__1webkit_1web_1view_1get_1context -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1context) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1context) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1context_FUNC); /* - rc = (jintLong)webkit_web_view_get_context(arg0); + rc = (jlong)webkit_web_view_get_context(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_context) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1context_FUNC); @@ -2822,18 +2822,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1context) #endif #ifndef NO__1webkit_1web_1view_1get_1dom_1document -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1dom_1document) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1dom_1document) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1dom_1document_FUNC); /* - rc = (jintLong)webkit_web_view_get_dom_document(arg0); + rc = (jlong)webkit_web_view_get_dom_document(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_dom_document) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1dom_1document_FUNC); @@ -2843,7 +2843,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1dom_1docum #ifndef NO__1webkit_1web_1view_1get_1estimated_1load_1progress JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1estimated_1load_1progress) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1estimated_1load_1progress_FUNC); @@ -2853,7 +2853,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1estimated_1 { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_estimated_load_progress) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1estimated_1load_1progress_FUNC); @@ -2863,7 +2863,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1estimated_1 #ifndef NO__1webkit_1web_1view_1get_1load_1status JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); @@ -2873,7 +2873,7 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_load_status) if (fp) { - rc = (jint)((jint (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jint)((jint (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); @@ -2882,18 +2882,18 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) #endif #ifndef NO__1webkit_1web_1view_1get_1main_1frame -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1frame) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1frame) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); /* - rc = (jintLong)webkit_web_view_get_main_frame(arg0); + rc = (jlong)webkit_web_view_get_main_frame(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_frame) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); @@ -2902,18 +2902,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1fram #endif #ifndef NO__1webkit_1web_1view_1get_1main_1resource -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1resource) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1resource) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1resource_FUNC); /* - rc = (jintLong)webkit_web_view_get_main_resource(arg0); + rc = (jlong)webkit_web_view_get_main_resource(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_resource) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1resource_FUNC); @@ -2922,18 +2922,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1reso #endif #ifndef NO__1webkit_1web_1view_1get_1page_1id -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1page_1id) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1page_1id) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1page_1id_FUNC); /* - rc = (jintLong)webkit_web_view_get_page_id(arg0); + rc = (jlong)webkit_web_view_get_page_id(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_page_id) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1page_1id_FUNC); @@ -2943,7 +2943,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1page_1id) #ifndef NO__1webkit_1web_1view_1get_1progress JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1progress_FUNC); @@ -2953,7 +2953,7 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_progress) if (fp) { - rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1progress_FUNC); @@ -2962,18 +2962,18 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) #endif #ifndef NO__1webkit_1web_1view_1get_1settings -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1settings_FUNC); /* - rc = (jintLong)webkit_web_view_get_settings(arg0); + rc = (jlong)webkit_web_view_get_settings(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_settings) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1settings_FUNC); @@ -2982,18 +2982,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) #endif #ifndef NO__1webkit_1web_1view_1get_1title -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1title_FUNC); /* - rc = (jintLong)webkit_web_view_get_title(arg0); + rc = (jlong)webkit_web_view_get_title(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_title) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1title_FUNC); @@ -3002,18 +3002,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) #endif #ifndef NO__1webkit_1web_1view_1get_1type -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1type) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1type) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1type_FUNC); /* - rc = (jintLong)webkit_web_view_get_type(); + rc = (jlong)webkit_web_view_get_type(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_type) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1type_FUNC); @@ -3022,18 +3022,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1type) #endif #ifndef NO__1webkit_1web_1view_1get_1uri -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1uri_FUNC); /* - rc = (jintLong)webkit_web_view_get_uri(arg0); + rc = (jlong)webkit_web_view_get_uri(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_uri) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1uri_FUNC); @@ -3042,18 +3042,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) #endif #ifndef NO__1webkit_1web_1view_1get_1window_1features -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1features) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1features) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); /* - rc = (jintLong)webkit_web_view_get_window_features(arg0); + rc = (jlong)webkit_web_view_get_window_features(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_features) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); @@ -3062,18 +3062,18 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1fe #endif #ifndef NO__1webkit_1web_1view_1get_1window_1properties -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1properties) - (JNIEnv *env, jclass that, jintLong arg0) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1properties) + (JNIEnv *env, jclass that, jlong arg0) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1properties_FUNC); /* - rc = (jintLong)webkit_web_view_get_window_properties(arg0); + rc = (jlong)webkit_web_view_get_window_properties(arg0); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_properties) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong))fp)(arg0); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1properties_FUNC); @@ -3083,7 +3083,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1pr #ifndef NO__1webkit_1web_1view_1go_1back JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1back_FUNC); /* @@ -3092,7 +3092,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_back) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1back_FUNC); @@ -3101,7 +3101,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) #ifndef NO__1webkit_1web_1view_1go_1forward JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1forward_FUNC); /* @@ -3110,7 +3110,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_forward) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1forward_FUNC); @@ -3119,7 +3119,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) #ifndef NO__1webkit_1web_1view_1load_1bytes JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1bytes) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) { jbyte *lparg2=NULL; jbyte *lparg3=NULL; @@ -3134,7 +3134,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1bytes) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_bytes) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jbyte *, jbyte *, jbyte *))fp)(arg0, arg1, lparg2, lparg3, lparg4); + ((void (CALLING_CONVENTION*)(jlong, jlong, jbyte *, jbyte *, jbyte *))fp)(arg0, arg1, lparg2, lparg3, lparg4); } } fail: @@ -3147,7 +3147,7 @@ fail: #ifndef NO__1webkit_1web_1view_1load_1html JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1html) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -3160,7 +3160,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1html) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_html) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2); } } fail: @@ -3172,7 +3172,7 @@ fail: #ifndef NO__1webkit_1web_1view_1load_1request JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1request) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1request_FUNC); /* @@ -3181,7 +3181,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1request) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_request) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong))fp)(arg0, arg1); + ((void (CALLING_CONVENTION*)(jlong, jlong))fp)(arg0, arg1); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1load_1request_FUNC); @@ -3190,7 +3190,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1request) #ifndef NO__1webkit_1web_1view_1load_1string JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jbyteArray arg2, jbyteArray arg3, jbyteArray arg4) { jbyte *lparg1=NULL; jbyte *lparg2=NULL; @@ -3207,7 +3207,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_string) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jbyte *, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2, lparg3, lparg4); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jbyte *, jbyte *, jbyte *))fp)(arg0, lparg1, lparg2, lparg3, lparg4); } } fail: @@ -3221,7 +3221,7 @@ fail: #ifndef NO__1webkit_1web_1view_1load_1uri JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1uri_FUNC); @@ -3232,7 +3232,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_uri) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *))fp)(arg0, lparg1); + ((void (CALLING_CONVENTION*)(jlong, jbyte *))fp)(arg0, lparg1); } } fail: @@ -3242,18 +3242,18 @@ fail: #endif #ifndef NO__1webkit_1web_1view_1new -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) (JNIEnv *env, jclass that) { - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1new_FUNC); /* - rc = (jintLong)webkit_web_view_new(); + rc = (jlong)webkit_web_view_new(); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_new) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + rc = (jlong)((jlong (CALLING_CONVENTION*)())fp)(); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1new_FUNC); @@ -3263,7 +3263,7 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) #ifndef NO__1webkit_1web_1view_1reload JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1reload_FUNC); /* @@ -3272,7 +3272,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_reload) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1reload_FUNC); @@ -3281,7 +3281,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) #ifndef NO__1webkit_1web_1view_1run_1javascript JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript) - (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jintLong arg2, jintLong arg3, jintLong arg4) + (JNIEnv *env, jclass that, jlong arg0, jbyteArray arg1, jlong arg2, jlong arg3, jlong arg4) { jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1run_1javascript_FUNC); @@ -3292,7 +3292,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_run_javascript) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jbyte *, jintLong, jintLong, jintLong))fp)(arg0, lparg1, arg2, arg3, arg4); + ((void (CALLING_CONVENTION*)(jlong, jbyte *, jlong, jlong, jlong))fp)(arg0, lparg1, arg2, arg3, arg4); } } fail: @@ -3302,20 +3302,20 @@ fail: #endif #ifndef NO__1webkit_1web_1view_1run_1javascript_1finish -JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript_1finish) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLongArray arg2) +JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1run_1javascript_1finish) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jintLongArray arg2) { jintLong *lparg2=NULL; - jintLong rc = 0; + jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1run_1javascript_1finish_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; /* - rc = (jintLong)webkit_web_view_run_javascript_finish(arg0, arg1, (GError **)lparg2); + rc = (jlong)webkit_web_view_run_javascript_finish(arg0, arg1, (GError **)lparg2); */ { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_run_javascript_finish) if (fp) { - rc = (jintLong)((jintLong (CALLING_CONVENTION*)(jintLong, jintLong, GError **))fp)(arg0, arg1, (GError **)lparg2); + rc = (jlong)((jlong (CALLING_CONVENTION*)(jlong, jlong, GError **))fp)(arg0, arg1, (GError **)lparg2); } } fail: @@ -3327,7 +3327,7 @@ fail: #ifndef NO__1webkit_1web_1view_1stop_1loading JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) - (JNIEnv *env, jclass that, jintLong arg0) + (JNIEnv *env, jclass that, jlong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); /* @@ -3336,7 +3336,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) { WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_stop_loading) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong))fp)(arg0); + ((void (CALLING_CONVENTION*)(jlong))fp)(arg0); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); @@ -3345,7 +3345,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) #ifndef NO__1webkit_1website_1data_1manager_1clear JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1website_1data_1manager_1clear) - (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jintLong arg5) + (JNIEnv *env, jclass that, jlong arg0, jlong arg1, jlong arg2, jlong arg3, jlong arg4, jlong arg5) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1website_1data_1manager_1clear_FUNC); /* @@ -3354,7 +3354,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1website_1data_1manager_1clear) { WebKitGTK_LOAD_FUNCTION(fp, webkit_website_data_manager_clear) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, jintLong, jintLong, jintLong, jintLong, jintLong))fp)(arg0, arg1, arg2, arg3, arg4, arg5); + ((void (CALLING_CONVENTION*)(jlong, jlong, jlong, jlong, jlong, jlong))fp)(arg0, arg1, arg2, arg3, arg4, arg5); } } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1website_1data_1manager_1clear_FUNC); @@ -3363,7 +3363,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1website_1data_1manager_1clear) #ifndef NO__1webkit_1window_1properties_1get_1geometry JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1window_1properties_1get_1geometry) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1) { GdkRectangle _arg1, *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1window_1properties_1get_1geometry_FUNC); @@ -3374,7 +3374,7 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1window_1properties_1get_1geome { WebKitGTK_LOAD_FUNCTION(fp, webkit_window_properties_get_geometry) if (fp) { - ((void (CALLING_CONVENTION*)(jintLong, GdkRectangle *))fp)(arg0, (GdkRectangle *)lparg1); + ((void (CALLING_CONVENTION*)(jlong, GdkRectangle *))fp)(arg0, (GdkRectangle *)lparg1); } } fail: @@ -3385,7 +3385,7 @@ fail: #ifndef NO_memmove JNIEXPORT void JNICALL WebKitGTK_NATIVE(memmove) - (JNIEnv *env, jclass that, jintLong arg0, jobject arg1, jintLong arg2) + (JNIEnv *env, jclass that, jlong arg0, jobject arg1, jlong arg2) { JSClassDefinition _arg1, *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, memmove_FUNC); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c index 7a3a3ead58..3c84951e3e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_structs.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2017 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2019 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -74,21 +74,21 @@ void cacheJSClassDefinitionFields(JNIEnv *env, jobject lpObject) JSClassDefinitionFc.clazz = (*env)->GetObjectClass(env, lpObject); JSClassDefinitionFc.version = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "version", "I"); JSClassDefinitionFc.attributes = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "attributes", "I"); - JSClassDefinitionFc.className = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "className", I_J); - JSClassDefinitionFc.parentClass = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "parentClass", I_J); - JSClassDefinitionFc.staticValues = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticValues", I_J); - JSClassDefinitionFc.staticFunctions = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticFunctions", I_J); - JSClassDefinitionFc.initialize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "initialize", I_J); - JSClassDefinitionFc.finalize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "finalize", I_J); - JSClassDefinitionFc.hasProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasProperty", I_J); - JSClassDefinitionFc.getProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getProperty", I_J); - JSClassDefinitionFc.setProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "setProperty", I_J); - JSClassDefinitionFc.deleteProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "deleteProperty", I_J); - JSClassDefinitionFc.getPropertyNames = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getPropertyNames", I_J); - JSClassDefinitionFc.callAsFunction = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsFunction", I_J); - JSClassDefinitionFc.callAsConstructor = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsConstructor", I_J); - JSClassDefinitionFc.hasInstance = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasInstance", I_J); - JSClassDefinitionFc.convertToType = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "convertToType", I_J); + JSClassDefinitionFc.className = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "className", "J"); + JSClassDefinitionFc.parentClass = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "parentClass", "J"); + JSClassDefinitionFc.staticValues = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticValues", "J"); + JSClassDefinitionFc.staticFunctions = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "staticFunctions", "J"); + JSClassDefinitionFc.initialize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "initialize", "J"); + JSClassDefinitionFc.finalize = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "finalize", "J"); + JSClassDefinitionFc.hasProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasProperty", "J"); + JSClassDefinitionFc.getProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getProperty", "J"); + JSClassDefinitionFc.setProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "setProperty", "J"); + JSClassDefinitionFc.deleteProperty = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "deleteProperty", "J"); + JSClassDefinitionFc.getPropertyNames = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "getPropertyNames", "J"); + JSClassDefinitionFc.callAsFunction = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsFunction", "J"); + JSClassDefinitionFc.callAsConstructor = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "callAsConstructor", "J"); + JSClassDefinitionFc.hasInstance = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "hasInstance", "J"); + JSClassDefinitionFc.convertToType = (*env)->GetFieldID(env, JSClassDefinitionFc.clazz, "convertToType", "J"); JSClassDefinitionFc.cached = 1; } @@ -97,21 +97,21 @@ JSClassDefinition *getJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSC if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject); lpStruct->version = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.version); lpStruct->attributes = (*env)->GetIntField(env, lpObject, JSClassDefinitionFc.attributes); - lpStruct->className = (const char*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.className); - lpStruct->parentClass = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass); - lpStruct->staticValues = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues); - lpStruct->staticFunctions = (const void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions); - lpStruct->initialize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.initialize); - lpStruct->finalize = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.finalize); - lpStruct->hasProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty); - lpStruct->getProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty); - lpStruct->setProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty); - lpStruct->deleteProperty = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty); - lpStruct->getPropertyNames = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames); - lpStruct->callAsFunction = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction); - lpStruct->callAsConstructor = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor); - lpStruct->hasInstance = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance); - lpStruct->convertToType = (void*)(*env)->GetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType); + lpStruct->className = (const char*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.className); + lpStruct->parentClass = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.parentClass); + lpStruct->staticValues = (const void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.staticValues); + lpStruct->staticFunctions = (const void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.staticFunctions); + lpStruct->initialize = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.initialize); + lpStruct->finalize = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.finalize); + lpStruct->hasProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.hasProperty); + lpStruct->getProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.getProperty); + lpStruct->setProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.setProperty); + lpStruct->deleteProperty = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.deleteProperty); + lpStruct->getPropertyNames = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames); + lpStruct->callAsFunction = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.callAsFunction); + lpStruct->callAsConstructor = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor); + lpStruct->hasInstance = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.hasInstance); + lpStruct->convertToType = (void*)(*env)->GetLongField(env, lpObject, JSClassDefinitionFc.convertToType); return lpStruct; } @@ -120,21 +120,21 @@ void setJSClassDefinitionFields(JNIEnv *env, jobject lpObject, JSClassDefinition if (!JSClassDefinitionFc.cached) cacheJSClassDefinitionFields(env, lpObject); (*env)->SetIntField(env, lpObject, JSClassDefinitionFc.version, (jint)lpStruct->version); (*env)->SetIntField(env, lpObject, JSClassDefinitionFc.attributes, (jint)lpStruct->attributes); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.className, (jintLong)lpStruct->className); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.parentClass, (jintLong)lpStruct->parentClass); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.staticValues, (jintLong)lpStruct->staticValues); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.staticFunctions, (jintLong)lpStruct->staticFunctions); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.initialize, (jintLong)lpStruct->initialize); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.finalize, (jintLong)lpStruct->finalize); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.hasProperty, (jintLong)lpStruct->hasProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.getProperty, (jintLong)lpStruct->getProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.setProperty, (jintLong)lpStruct->setProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.deleteProperty, (jintLong)lpStruct->deleteProperty); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames, (jintLong)lpStruct->getPropertyNames); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.callAsFunction, (jintLong)lpStruct->callAsFunction); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor, (jintLong)lpStruct->callAsConstructor); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.hasInstance, (jintLong)lpStruct->hasInstance); - (*env)->SetIntLongField(env, lpObject, JSClassDefinitionFc.convertToType, (jintLong)lpStruct->convertToType); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.className, (jlong)lpStruct->className); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.parentClass, (jlong)lpStruct->parentClass); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.staticValues, (jlong)lpStruct->staticValues); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.staticFunctions, (jlong)lpStruct->staticFunctions); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.initialize, (jlong)lpStruct->initialize); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.finalize, (jlong)lpStruct->finalize); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.hasProperty, (jlong)lpStruct->hasProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.getProperty, (jlong)lpStruct->getProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.setProperty, (jlong)lpStruct->setProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.deleteProperty, (jlong)lpStruct->deleteProperty); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.getPropertyNames, (jlong)lpStruct->getPropertyNames); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.callAsFunction, (jlong)lpStruct->callAsFunction); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.callAsConstructor, (jlong)lpStruct->callAsConstructor); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.hasInstance, (jlong)lpStruct->hasInstance); + (*env)->SetLongField(env, lpObject, JSClassDefinitionFc.convertToType, (jlong)lpStruct->convertToType); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index be699439d2..4240ac0a9f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -126,12 +126,12 @@ class WebKit extends WebBrowser { * WebKitWebView * Note, as of time at compleating webkit2, (18th April 2018, we ) */ - long /*int*/ webView; - long /*int*/ scrolledWindow; + long webView; + long scrolledWindow; long pageId; /** Webkit1 only. Used by the externalObject for javascript callback to java. */ - long /*int*/ webViewData; + long webViewData; int failureCount, lastKeyCode, lastCharCode; @@ -143,7 +143,7 @@ class WebKit extends WebBrowser { boolean ignoreDispose; // Webkit1 & Webkit2. boolean tlsError; - long /*int*/ tlsErrorCertificate; + long tlsErrorCertificate; String tlsErrorUriString; URI tlsErrorUri; String tlsErrorType; @@ -179,9 +179,9 @@ class WebKit extends WebBrowser { static int DisabledJSCount; /** Webkit1 only. Used for callJava. See JSObjectHasPropertyProc */ - static long /*int*/ ExternalClass; + static long ExternalClass; - static long /*int*/ PostString, WebViewType; + static long PostString, WebViewType; static Map<LONG, LONG> WindowMappings = new HashMap<> (); static Map<LONG, Integer> webKitDownloadStatus = new HashMap<> (); // Webkit2 @@ -310,23 +310,23 @@ class WebKit extends WebBrowser { if (WebKitGTK.webkit_get_minor_version() >= 16) { // TODO: webkit_website_data_manager_clear currently does not // support more fine grained removals. (I.e, session vs all cookies) - long /*int*/ context = WebKitGTK.webkit_web_context_get_default(); - long /*int*/ manager = WebKitGTK.webkit_web_context_get_website_data_manager (context); + 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); } else { System.err.println("SWT Webkit. Warning, clear cookies only supported on Webkitgtk version 2.16 and above. Your version is:" + internalGetWebKitVersionStr()); } } else { - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); - long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + long session = WebKitGTK.webkit_get_default_session (); + long type = WebKitGTK.soup_cookie_jar_get_type (); + long jar = WebKitGTK.soup_session_get_feature (session, type); if (jar == 0) return; - long /*int*/ cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar); + long cookies = WebKitGTK.soup_cookie_jar_all_cookies (jar); int length = OS.g_slist_length (cookies); - long /*int*/ current = cookies; + long current = cookies; for (int i = 0; i < length; i++) { - long /*int*/ cookie = OS.g_slist_data (current); - long /*int*/ expires = WebKitGTK.SoupCookie_expires (cookie); + long cookie = OS.g_slist_data (current); + long expires = WebKitGTK.SoupCookie_expires (cookie); if (expires == 0) { /* indicates a session cookie */ WebKitGTK.soup_cookie_jar_delete_cookie (jar, cookie); @@ -349,14 +349,14 @@ class WebKit extends WebBrowser { return; } - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); - long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + long session = WebKitGTK.webkit_get_default_session (); + long type = WebKitGTK.soup_cookie_jar_get_type (); + long jar = WebKitGTK.soup_session_get_feature (session, type); if (jar == 0) return; byte[] bytes = Converter.wcsToMbcs (CookieUrl, true); - long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + long uri = WebKitGTK.soup_uri_new (bytes); if (uri == 0) return; - long /*int*/ cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0); + long cookies = WebKitGTK.soup_cookie_jar_get_cookies (jar, uri, 0); WebKitGTK.soup_uri_free (uri); if (cookies == 0) return; int length = C.strlen (cookies); @@ -388,9 +388,9 @@ class WebKit extends WebBrowser { return; } - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ type = WebKitGTK.soup_cookie_jar_get_type (); - long /*int*/ jar = WebKitGTK.soup_session_get_feature (session, type); + long session = WebKitGTK.webkit_get_default_session (); + long type = WebKitGTK.soup_cookie_jar_get_type (); + long jar = WebKitGTK.soup_session_get_feature (session, type); if (jar == 0) { /* this happens if a navigation has not occurred yet */ WebKitGTK.soup_session_add_feature_by_type (session, type); @@ -398,10 +398,10 @@ class WebKit extends WebBrowser { } if (jar == 0) return; byte[] bytes = Converter.wcsToMbcs (CookieUrl, true); - long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + long uri = WebKitGTK.soup_uri_new (bytes); if (uri == 0) return; bytes = Converter.wcsToMbcs (CookieValue, true); - long /*int*/ cookie = WebKitGTK.soup_cookie_parse (bytes, uri); + long cookie = WebKitGTK.soup_cookie_parse (bytes, uri); if (cookie != 0) { WebKitGTK.soup_cookie_jar_add_cookie (jar, cookie); // the following line is intentionally commented @@ -516,7 +516,7 @@ class WebKit extends WebBrowser { static String getWebExtensionIdentifer() { return webkitWebExtensionIdentifier; } - static String getJavaScriptFunctionDeclaration(long /*int*/ webView) { + static String getJavaScriptFunctionDeclaration(long webView) { return "if (!window.callJava) {\n" + " window.callJava = function callJava(index, token, args) {\n" + " return " + javaScriptFunctionName + "('" + String.valueOf(webView) + "', index, token, args);\n" @@ -569,7 +569,7 @@ class WebKit extends WebBrowser { * See documenation: WebKitWebExtension (Description) */ @SuppressWarnings("unused") // Only called directly from C - private static void initializeWebExtensions_callback (long /*int*/ WebKitWebContext, long /*int*/ user_data) { + private static void initializeWebExtensions_callback (long WebKitWebContext, long user_data) { // 1) GDBus: // Normally we'd first initialize gdbus channel. But gdbus makes Browser slower and isn't always needed. // So WebkitGDBus is lazy-initialized, although it can be initialized here if gdbus is ever needed @@ -606,7 +606,7 @@ class WebKit extends WebBrowser { * (as a note, the webprocess would have to load the gmodule). */ WebKitGTK.webkit_web_context_set_web_extensions_directory(WebKitGTK.webkit_web_context_get_default(), Converter.wcsToMbcs (extensionsFolder, true)); - long /*int*/ gvariantUserData = OS.g_variant_new_int32(uniqueID); + long gvariantUserData = OS.g_variant_new_int32(uniqueID); WebKitGTK.webkit_web_context_set_web_extensions_initialization_user_data(WebKitGTK.webkit_web_context_get_default(), gvariantUserData); } @@ -681,16 +681,16 @@ class WebKit extends WebBrowser { } -static String getString (long /*int*/ strPtr) { +static String getString (long strPtr) { int length = C.strlen (strPtr); byte [] buffer = new byte [length]; C.memmove (buffer, strPtr, length); return new String (Converter.mbcsToWcs (buffer)); } -static Browser FindBrowser (long /*int*/ webView) { +static Browser FindBrowser (long webView) { if (webView == 0) return null; - long /*int*/ parent = GTK.gtk_widget_get_parent (webView); + long parent = GTK.gtk_widget_get_parent (webView); if (WEBKIT1){ parent = GTK.gtk_widget_get_parent (parent); } @@ -714,7 +714,7 @@ static boolean IsInstalled () { * Webkit1 callback. Used when external.callJava is called in javascript. * Not used by Webkit2. */ -static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ function, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { +static long JSObjectCallAsFunctionProc (long ctx, long function, long thisObject, long argumentCount, long arguments, long exception) { if (WEBKIT2) { System.err.println("Internal error: SWT JSObjectCallAsFunctionProc. This should never have been called on webkit2."); return 0; @@ -723,7 +723,7 @@ static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ f if (WebKitGTK.JSValueIsObjectOfClass (ctx, thisObject, ExternalClass) == 0) { return WebKitGTK.JSValueMakeUndefined (ctx); } - long /*int*/ ptr = WebKitGTK.JSObjectGetPrivate (thisObject); + long ptr = WebKitGTK.JSObjectGetPrivate (thisObject); long /*int*/[] handle = new long /*int*/[1]; C.memmove (handle, ptr, C.PTR_SIZEOF); Browser browser = FindBrowser (handle[0]); @@ -737,14 +737,14 @@ static long /*int*/ JSObjectCallAsFunctionProc (long /*int*/ ctx, long /*int*/ f * It's used to initialize the 'callJava' function pointer in the 'external' object, * such that external.callJava reaches Java land. */ -static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ exception) { +static long JSObjectGetPropertyProc (long ctx, long object, long propertyName, long exception) { if (WEBKIT2) { System.err.println("Internal error: SWT WebKit.java:JSObjectGetPropertyProc. This should never have been called on webkit2."); return 0; } byte[] bytes = (FUNCTIONNAME_CALLJAVA + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); - long /*int*/ function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ()); + long name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long function = WebKitGTK.JSObjectMakeFunctionWithCallback (ctx, name, JSObjectCallAsFunctionProc.getAddress ()); WebKitGTK.JSStringRelease (name); return function; } @@ -752,7 +752,7 @@ static long /*int*/ JSObjectGetPropertyProc (long /*int*/ ctx, long /*int*/ obje /** * Webkit1: Check if the 'external' object regiseterd earlied has the 'callJava' property. */ -static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName) { +static long JSObjectHasPropertyProc (long ctx, long object, long propertyName) { if (WEBKIT2) { System.err.println("Internal error: SWT JSObjectHasPropertyProc. This should never have been called on webkit2."); return 0; @@ -761,7 +761,7 @@ static long /*int*/ JSObjectHasPropertyProc (long /*int*/ ctx, long /*int*/ obje return WebKitGTK.JSStringIsEqualToUTF8CString (propertyName, bytes); } -static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long /*int*/ user_data) { +static long JSDOMEventProc (long arg0, long event, long user_data) { if (WEBKIT1 && GTK.GTK_IS_SCROLLED_WINDOW (arg0)) { /* * Stop the propagation of events that are not consumed by WebKit, before @@ -854,12 +854,12 @@ static long /*int*/ JSDOMEventProc (long /*int*/ arg0, long /*int*/ event, long return 0; } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ user_data) { - long /*int*/ webView = handle; +static long Proc (long handle, long user_data) { + long webView = handle; if (WEBKIT2 && user_data == FINISHED) { // Special case, callback from WebKitDownload instead of webview. - long /*int*/ webKitDownload = handle; + long webKitDownload = handle; return webkit_download_finished(webKitDownload); } @@ -869,7 +869,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ user_data) { return webkit.webViewProc (handle, user_data); } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +static long Proc (long handle, long arg0, long user_data) { // As a note, don't use instance checks like 'G_TYPE_CHECK_INSTANCE_TYPE ' // to determine difference between webview and webcontext as these // don't seem to work reliably for all clients. For some clients they always return true. @@ -883,7 +883,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u // Note, G_TYPE_CHECK_INSTANCE_TYPE is not a good way to test for type. See it's javadoc. // only kept for webkit1 legacy reason. if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) { - long /*int*/ webView = WebKitGTK.webkit_web_frame_get_web_view (handle); // webkit1 only. + long webView = WebKitGTK.webkit_web_frame_get_web_view (handle); // webkit1 only. Browser browser = FindBrowser (webView); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; @@ -894,7 +894,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u if (WEBKIT2 && user_data == DOWNLOAD_STARTED) { // This callback comes from WebKitWebContext as oppose to the WebView. So handle is WebContext not Webview. // user_function (WebKitWebContext *context, WebKitDownload *download, gpointer user_data) - long /*int*/ webKitDownload = arg0; + long webKitDownload = arg0; webkit_download_started(webKitDownload); return 0; } @@ -902,21 +902,21 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u if (WEBKIT2 && user_data == DECIDE_DESTINATION) { // This callback comes from WebKitDownload, so handle is WebKitDownload not webview. // gboolean user_function (WebKitDownload *download, gchar *suggested_filename, gpointer user_data) - long /*int*/ webKitDownload = handle; - long /*int*/ suggested_filename = arg0; + long webKitDownload = handle; + long suggested_filename = arg0; return webkit_download_decide_destination(webKitDownload,suggested_filename); } if (WEBKIT2 && user_data == FAILED) { // void user_function (WebKitDownload *download, GError *error, gpointer user_data) - long /*int*/ webKitDownload = handle; + long webKitDownload = handle; return webkit_download_failed(webKitDownload); } } { // Callbacks connected with a WebView. assert handle != 0 : "Webview shouldn't be null here"; - long /*int*/ webView = handle; + long webView = handle; Browser browser = FindBrowser (webView); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; @@ -924,15 +924,15 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u } } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { +static long Proc (long handle, long arg0, long arg1, long user_data) { Browser browser = FindBrowser (handle); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; return webkit.webViewProc (handle, arg0, arg1, user_data); } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { - long /*int*/ webView; +static long Proc (long handle, long arg0, long arg1, long arg2, long user_data) { + long webView; // Note: G_TYPE_CHECK_INSTANCE_TYPE is not a good way to check for instance type, see it's javadoc. // Kept only for webkit1 legacy reasons. Do not use in new code. @@ -952,7 +952,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } } -static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { +static long Proc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { Browser browser = FindBrowser (handle); if (browser == null) return 0; WebKit webkit = (WebKit)browser.webBrowser; @@ -960,7 +960,7 @@ static long /*int*/ Proc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } /** Webkit1 only */ -long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ auth, long /*int*/ retrying, long /*int*/ user_data) { +long sessionProc (long session, long msg, long auth, long retrying, long user_data) { /* authentication challenges are currently the only notification received from the session */ assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; if (retrying == 0) { @@ -969,8 +969,8 @@ long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ a if (++failureCount >= 3) return 0; } - long /*int*/ uri = WebKitGTK.soup_message_get_uri (msg); - long /*int*/ uriString = WebKitGTK.soup_uri_to_string (uri, 0); + long uri = WebKitGTK.soup_message_get_uri (msg); + long uriString = WebKitGTK.soup_uri_to_string (uri, 0); int length = C.strlen (uriString); byte[] bytes = new byte[length]; C.memmove (bytes, uriString, length); @@ -1001,7 +1001,7 @@ long /*int*/ sessionProc (long /*int*/ session, long /*int*/ msg, long /*int*/ a * - gboolean user_function (WebKitWebView *web_view, WebKitAuthenticationRequest *request, gpointer user_data) * - https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#WebKitWebView-authenticate */ -long /*int*/ webkit_authenticate (long /*int*/ web_view, long /*int*/ request){ +long webkit_authenticate (long web_view, long request){ /* authentication challenges are currently the only notification received from the session */ if (!WebKitGTK.webkit_authentication_request_is_retry(request)) { @@ -1033,7 +1033,7 @@ long /*int*/ webkit_authenticate (long /*int*/ web_view, long /*int*/ request){ if (event.user != null && event.password != null) { byte[] userBytes = Converter.wcsToMbcs (event.user, true); byte[] passwordBytes = Converter.wcsToMbcs (event.password, true); - long /*int*/ credentials = WebKitGTK.webkit_credential_new (userBytes, passwordBytes, WebKitGTK.WEBKIT_CREDENTIAL_PERSISTENCE_NONE); + long credentials = WebKitGTK.webkit_credential_new (userBytes, passwordBytes, WebKitGTK.WEBKIT_CREDENTIAL_PERSISTENCE_NONE); WebKitGTK.webkit_authentication_request_authenticate(request, credentials); WebKitGTK.webkit_credential_free(credentials); return 0; @@ -1042,7 +1042,7 @@ long /*int*/ webkit_authenticate (long /*int*/ web_view, long /*int*/ request){ return 0; } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ user_data) { +long webViewProc (long handle, long user_data) { switch ((int)/*64*/user_data) { case CLOSE_WEB_VIEW: return webkit_close_web_view (handle); case WEB_VIEW_READY: return webkit_web_view_ready (handle); @@ -1050,7 +1050,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ user_data) { } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long user_data) { switch ((int)/*64*/user_data) { case CREATE_WEB_VIEW: return webkit_create_web_view (handle, arg0); case DOWNLOAD_REQUESTED: return webkit_download_requested (handle, arg0); // webkit1 @@ -1065,7 +1065,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ u } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long arg1, long user_data) { switch ((int)/*64*/user_data) { case HOVERING_OVER_LINK: return webkit_hovering_over_link (handle, arg0, arg1); // Webkit1 only case MOUSE_TARGET_CHANGED: return webkit_mouse_target_changed (handle, arg0, arg1); // Webkit2 only. @@ -1074,7 +1074,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long arg1, long arg2, long user_data) { switch ((int)/*64*/user_data) { case CONSOLE_MESSAGE: return webkit_console_message (handle, arg0, arg1, arg2); case WINDOW_OBJECT_CLEARED: return webkit_window_object_cleared (handle, arg0, arg1, arg2); @@ -1084,7 +1084,7 @@ long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ a } } -long /*int*/ webViewProc (long /*int*/ handle, long /*int*/ arg0, long /*int*/ arg1, long /*int*/ arg2, long /*int*/ arg3, long /*int*/ user_data) { +long webViewProc (long handle, long arg0, long arg1, long arg2, long arg3, long user_data) { switch ((int)/*64*/user_data) { case MIME_TYPE_POLICY_DECISION_REQUESTED: return webkit_mime_type_policy_decision_requested (handle, arg0, arg1, arg2, arg3); // Webkit1 case NAVIGATION_POLICY_DECISION_REQUESTED: return webkit_navigation_policy_decision_requested (handle, arg0, arg1, arg2, arg3); @@ -1111,7 +1111,7 @@ public void create (Composite parent, int style) { jsClassDefinition.hasProperty = JSObjectHasPropertyProc.getAddress (); jsClassDefinition.getProperty = JSObjectGetPropertyProc.getAddress (); - long /*int*/ classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); + long classDefinitionPtr = C.malloc (JSClassDefinition.sizeof); WebKitGTK.memmove (classDefinitionPtr, jsClassDefinition, JSClassDefinition.sizeof); ExternalClass = WebKitGTK.JSClassCreate (classDefinitionPtr); @@ -1129,7 +1129,7 @@ public void create (Composite parent, int style) { * icon database, which should not affect the Browser in any way. */ if (WEBKIT1){ - long /*int*/ database = WebKitGTK.webkit_get_favicon_database (); + long database = WebKitGTK.webkit_get_favicon_database (); if (database != 0) { /* WebKitGTK version is >= 1.8.x */ WebKitGTK.webkit_favicon_database_set_path (database, 0); @@ -1281,7 +1281,7 @@ public void create (Composite parent, int style) { byte[] bytes = Converter.wcsToMbcs ("UTF-8", true); // $NON-NLS-1$ - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); OS.g_object_set (settings, WebKitGTK.javascript_can_open_windows_automatically, 1, 0); OS.g_object_set (settings, WebKitGTK.enable_webgl, 1, 0); @@ -1335,8 +1335,8 @@ public void create (Composite parent, int style) { * queue by removing the default Authenticate listener, adding ours, * and then re-adding the default listener. */ - long /*int*/ session = WebKitGTK.webkit_get_default_session (); - long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); + long session = WebKitGTK.webkit_get_default_session (); + long originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ()); if (originalAuth != 0) { WebKitGTK.soup_session_feature_detach (originalAuth, session); } @@ -1366,7 +1366,7 @@ public void create (Composite parent, int style) { } proxyHost += ":" + port; //$NON-NLS-1$ bytes = Converter.wcsToMbcs (proxyHost, true); - long /*int*/ uri = WebKitGTK.soup_uri_new (bytes); + long uri = WebKitGTK.soup_uri_new (bytes); if (uri != 0) { OS.g_object_set (session, WebKitGTK.SOUP_SESSION_PROXY_URI, uri, 0); WebKitGTK.soup_uri_free (uri); @@ -1410,7 +1410,7 @@ public void create (Composite parent, int style) { } } -void addEventHandlers (long /*int*/ web_view, boolean top) { +void addEventHandlers (long web_view, boolean top) { /* * If JS is disabled (causes DOM events to not be delivered) then do not add event * listeners here, DOM events will be inferred from received GDK events instead. @@ -1422,7 +1422,7 @@ void addEventHandlers (long /*int*/ web_view, boolean top) { // TODO implement equivalent? // As a note, this entire function only seems to do webkit1-only stuff at the moment... } else { - long /*int*/ domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view); // Webkit1 only + long domDocument = WebKitGTK.webkit_web_view_get_dom_document (web_view); // Webkit1 only if (domDocument != 0) { WindowMappings.put (new LONG (domDocument), new LONG (web_view)); WebKitGTK.webkit_dom_event_target_add_event_listener (domDocument, WebKitGTK.dragstart, JSDOMEventProc.getAddress (), 0, SWT.DragDetect); @@ -1595,10 +1595,10 @@ void nonBlockingExecute(String script) { * @return true if the action succeeded (or was performed asynchronously), false if it failed */ private boolean webkit_extension_modify_function (long pageId, String function, String url, String action){ - long /*int*/ args[] = { OS.g_variant_new_uint64(pageId), + long args[] = { OS.g_variant_new_uint64(pageId), OS.g_variant_new_string (Converter.javaStringToCString(function)), OS.g_variant_new_string (Converter.javaStringToCString(url))}; - final long /*int*/ argsTuple = OS.g_variant_new_tuple(args, args.length); + final long argsTuple = OS.g_variant_new_tuple(args, args.length); if (argsTuple == 0) return false; String dbusMethodName = "webkitgtk_extension_" + action + "_function"; Object returnVal = WebkitGDBus.callExtensionSync(argsTuple, dbusMethodName); @@ -1634,15 +1634,15 @@ public boolean execute (String script) { return true; } else { byte[] scriptBytes = (script + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ jsScriptString = WebKitGTK.JSStringCreateWithUTF8CString (scriptBytes); + long jsScriptString = WebKitGTK.JSStringCreateWithUTF8CString (scriptBytes); // Currently loaded website will be used as 'source file' of the javascript to be exucuted. byte[] sourceUrlbytes = (getUrl () + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ jsSourceUrlString = WebKitGTK.JSStringCreateWithUTF8CString (sourceUrlbytes); - long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); - long /*int*/ context = WebKitGTK.webkit_web_frame_get_global_context (frame); - long /*int*/ result = WebKitGTK.JSEvaluateScript (context, jsScriptString, 0, jsSourceUrlString, 0, null); + long jsSourceUrlString = WebKitGTK.JSStringCreateWithUTF8CString (sourceUrlbytes); + long frame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long context = WebKitGTK.webkit_web_frame_get_global_context (frame); + long result = WebKitGTK.JSEvaluateScript (context, jsScriptString, 0, jsSourceUrlString, 0, null); WebKitGTK.JSStringRelease (jsSourceUrlString); WebKitGTK.JSStringRelease (jsScriptString); return result != 0; @@ -1732,7 +1732,7 @@ private static class Webkit2AsyncToSync { } } - static Object evaluate (String script, Browser browser, long /*int*/ webView) { + static Object evaluate (String script, Browser browser, long webView) { // /* Wrap script around a temporary function for backwards compatibility, // * user can specify 'return', which may not be at the beginning of the script. // * Valid scripts: @@ -1782,7 +1782,7 @@ private static class Webkit2AsyncToSync { * - call webextension over gdbus, parse return value. * */ - static Object runjavascript(String script, Browser browser, long /*int*/ webView) { + static Object runjavascript(String script, Browser browser, long webView) { if (nonBlockingEvaluate > 0) { // Execute script, but do not wait for async call to complete. (assume it does). Bug 512001. WebKitGTK.webkit_web_view_run_javascript(webView, Converter.wcsToMbcs(script, true), 0, 0, 0); @@ -1808,23 +1808,23 @@ private static class Webkit2AsyncToSync { } @SuppressWarnings("unused") // Only called directly from C (from javascript). - private static void runjavascript_callback (long /*int*/ GObject_source, long /*int*/ GAsyncResult, long /*int*/ user_data) { + private static void runjavascript_callback (long GObject_source, long GAsyncResult, long user_data) { int callbackId = (int) user_data; Webkit2AsyncReturnObj retObj = CallBackMap.getObj(callbackId); if (retObj != null) { // retObj can be null if there was a timeout. - long /*int*/[] gerror = new long /*int*/ [1]; // GError ** - long /*int*/ js_result = WebKitGTK.webkit_web_view_run_javascript_finish(GObject_source, GAsyncResult, gerror); + long /*int*/[] gerror = new long [1]; // GError ** + long js_result = WebKitGTK.webkit_web_view_run_javascript_finish(GObject_source, GAsyncResult, gerror); if (js_result == 0) { - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); OS.g_error_free(gerror[0]); retObj.errorNum = SWT.ERROR_FAILED_EVALUATE; retObj.errorMsg = msg != null ? msg : ""; } else { - long /*int*/ context = WebKitGTK.webkit_javascript_result_get_global_context (js_result); - long /*int*/ value = WebKitGTK.webkit_javascript_result_get_value (js_result); + long context = WebKitGTK.webkit_javascript_result_get_global_context (js_result); + long value = WebKitGTK.webkit_javascript_result_get_value (js_result); try { retObj.returnValue = convertToJava(context, value); @@ -1839,8 +1839,8 @@ private static class Webkit2AsyncToSync { Display.getCurrent().wake(); } - static String getText(Browser browser, long /*int*/ webView) { - long /*int*/ WebKitWebResource = WebKitGTK.webkit_web_view_get_main_resource(webView); + static String getText(Browser browser, long webView) { + long WebKitWebResource = WebKitGTK.webkit_web_view_get_main_resource(webView); if (WebKitWebResource == 0) { // No page yet loaded. return ""; } @@ -1861,13 +1861,13 @@ private static class Webkit2AsyncToSync { } @SuppressWarnings("unused") // Callback only called only by C directly - private static void getText_callback(long /*int*/ WebResource, long /*int*/ GAsyncResult, long /*int*/ user_data) { + private static void getText_callback(long WebResource, long GAsyncResult, long user_data) { int callbackId = (int) user_data; Webkit2AsyncReturnObj retObj = CallBackMap.getObj(callbackId); - long /*int*/[] gsize_len = new long /*int*/ [1]; - long /*int*/[] gerrorRes = new long /*int*/ [1]; // GError ** - long /*int*/ guchar_data = WebKitGTK.webkit_web_resource_get_data_finish(WebResource, GAsyncResult, gsize_len, gerrorRes); + long /*int*/[] gsize_len = new long [1]; + long /*int*/[] gerrorRes = new long [1]; // GError ** + long guchar_data = WebKitGTK.webkit_web_resource_get_data_finish(WebResource, GAsyncResult, gsize_len, gerrorRes); if (gerrorRes[0] != 0 || guchar_data == 0) { OS.g_error_free(gerrorRes[0]); retObj.returnValue = (String) ""; @@ -1957,13 +1957,13 @@ public String getText () { return Webkit2AsyncToSync.getText(browser, webView); } else { // Webkit1 only. - long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); - long /*int*/ source = WebKitGTK.webkit_web_frame_get_data_source (frame); + long frame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long source = WebKitGTK.webkit_web_frame_get_data_source (frame); if (source == 0) return ""; //$NON-NLS-1$ - long /*int*/ data = WebKitGTK.webkit_web_data_source_get_data (source); + long data = WebKitGTK.webkit_web_data_source_get_data (source); if (data == 0) return ""; //$NON-NLS-1$ - long /*int*/ encoding = WebKitGTK.webkit_web_data_source_get_encoding (source); + long encoding = WebKitGTK.webkit_web_data_source_get_encoding (source); int length = C.strlen (encoding); byte[] bytes = new byte [length]; C.memmove (bytes, encoding, length); @@ -1971,7 +1971,7 @@ public String getText () { length = OS.GString_len (data); bytes = new byte[length]; - long /*int*/ string = OS.GString_str (data); + long string = OS.GString_str (data); C.memmove (bytes, string, length); try { @@ -1989,7 +1989,7 @@ public String getUrl () { System.err.println("SWT Webkit: getUrl() called after widget disposed. Should not have happened.\n" + getInternalErrorMsg()); return null; // Disposed. } - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); /* WebKit auto-navigates to about:blank at startup */ if (uri == 0) return ABOUT_BLANK; @@ -2014,7 +2014,7 @@ public String getUrl () { return url; } -boolean handleDOMEvent (long /*int*/ event, int type) { +boolean handleDOMEvent (long event, int type) { /* * This method handles JS events that are received through the DOM * listener API that was introduced in WebKitGTK 1.4. @@ -2076,7 +2076,7 @@ boolean handleDOMEvent (long /*int*/ event, int type) { /* key event */ int keyEventState = 0; - long /*int*/ eventPtr = GTK.gtk_get_current_event (); + long eventPtr = GTK.gtk_get_current_event (); if (eventPtr != 0) { int eventType = GDK.gdk_event_get_event_type(eventPtr); int [] state = new int[1]; @@ -2374,7 +2374,7 @@ boolean handleMouseEvent (String type, int screenX, int screenY, int detail, int return true; } -long /*int*/ handleLoadCommitted (long /*int*/ uri, boolean top) { +long handleLoadCommitted (long uri, boolean top) { int length = C.strlen (uri); byte[] bytes = new byte[length]; C.memmove (bytes, uri, length); @@ -2476,7 +2476,7 @@ private void fireProgressCompletedEvent(){ /** Webkit1 only. * (Webkit2 equivalent is webkit_load_changed()) */ -long /*int*/ handleLoadFinished (long /*int*/ uri, boolean top) { +long handleLoadFinished (long uri, boolean top) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; int length = C.strlen (uri); byte[] bytes = new byte[length]; @@ -2529,8 +2529,8 @@ long /*int*/ handleLoadFinished (long /*int*/ uri, boolean top) { * the event here with the page's url as the title. */ if (top) { - long /*int*/ frame = WebKitGTK.webkit_web_view_get_main_frame (webView); - long /*int*/ title = WebKitGTK.webkit_web_frame_get_title (frame); + long frame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long title = WebKitGTK.webkit_web_frame_get_title (frame); if (title == 0) { fireNewTitleEvent(url); if (browser.isDisposed ()) return 0; @@ -2593,7 +2593,7 @@ void onDispose (Event e) { // org.eclipse.swt.tests.junit.memoryleak.Test_Memory_Leak.test_Browser() OS.g_object_ref (webView); GTK.gtk_container_remove (GTK.gtk_widget_get_parent (webView), webView); - long /*int*/ webViewTempRef = webView; + long webViewTempRef = webView; browser.getDisplay().asyncExec(() -> { OS.g_object_unref (webViewTempRef); }); @@ -2612,12 +2612,12 @@ void onResize (Event e) { } } -void openDownloadWindow (final long /*int*/ webkitDownload) { +void openDownloadWindow (final long webkitDownload) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; openDownloadWindow(webkitDownload, null); } -void openDownloadWindow (final long /*int*/ webkitDownload, final String suggested_filename) { +void openDownloadWindow (final long webkitDownload, final String suggested_filename) { final Shell shell = new Shell (); String msg = Compatibility.getMessage ("SWT_FileDownload"); //$NON-NLS-1$ shell.setText (msg); @@ -2629,7 +2629,7 @@ void openDownloadWindow (final long /*int*/ webkitDownload, final String suggest String nameString; if (WEBKIT1) { - long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload); + long name = WebKitGTK.webkit_download_get_suggested_filename (webkitDownload); int length = C.strlen (name); byte[] bytes = new byte[length]; C.memmove (bytes, name, length); @@ -2638,11 +2638,11 @@ void openDownloadWindow (final long /*int*/ webkitDownload, final String suggest nameString = suggested_filename; } - long /*int*/ url; + long url; if (WEBKIT1) { url = WebKitGTK.webkit_download_get_uri (webkitDownload); } else { - long /*int*/ request = WebKitGTK.webkit_download_get_request(webkitDownload); + long request = WebKitGTK.webkit_download_get_request(webkitDownload); url = WebKitGTK.webkit_uri_request_get_uri(request); } int length = C.strlen (url); @@ -2719,7 +2719,7 @@ void openDownloadWindow (final long /*int*/ webkitDownload, final String suggest total = WebKitGTK.webkit_download_get_total_size (webkitDownload) / 1024L; } else { current = WebKitGTK.webkit_download_get_received_data_length(webkitDownload) / 1024L; - long /*int*/ response = WebKitGTK.webkit_download_get_response(webkitDownload); + long response = WebKitGTK.webkit_download_get_response(webkitDownload); total = WebKitGTK.webkit_uri_response_get_content_length(response) / 1024L; } String message = Compatibility.getMessage ("SWT_Download_Status", new Object[] {Long.valueOf(current), new Long(total)}); //$NON-NLS-1$ @@ -2816,7 +2816,7 @@ public boolean setUrl (String url, String postData, String[] headers) { * set the value on the WebView when initiating the load request and then * remove it afterwards. */ - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); if (headers != null) { for (int i = 0; i < headers.length; i++) { String current = headers[i]; @@ -2839,8 +2839,8 @@ public boolean setUrl (String url, String postData, String[] headers) { byte[] uriBytes = Converter.wcsToMbcs (url, true); if (WEBKIT2 && postData==null && headers != null) { - long /*int*/ request = WebKitGTK.webkit_uri_request_new (uriBytes); - long /*int*/ requestHeaders = WebKitGTK.webkit_uri_request_get_http_headers (request); + long request = WebKitGTK.webkit_uri_request_new (uriBytes); + long requestHeaders = WebKitGTK.webkit_uri_request_get_http_headers (request); if (requestHeaders != 0) { addRequestHeaders(requestHeaders, headers); } @@ -2857,7 +2857,7 @@ public boolean setUrl (String url, String postData, String[] headers) { final String base_url = url; // Use Webkit User-Agent - long /*int*/ [] user_agent_str_ptr = new long /*int*/ [1]; + long [] user_agent_str_ptr = new long [1]; OS.g_object_get (settings, WebKitGTK.user_agent, user_agent_str_ptr, 0); final String userAgent = Converter.cCharPtrToJavaString(user_agent_str_ptr[0], true); final int lastRequest = w2_bug527738LastRequestCounter.incrementAndGet(); // Webkit 2 only @@ -2942,7 +2942,7 @@ public boolean setUrl (String url, String postData, String[] headers) { byte [] html_bytes = Converter.wcsToMbcs(final_html, false); byte [] mime_type_bytes = final_mime_type != null ? Converter.javaStringToCString(final_mime_type) : Converter.javaStringToCString("text/plain"); byte [] encoding_bytes = final_encoding_type != null ? Converter.wcsToMbcs(final_encoding_type, true) : new byte [] {0}; - long /*int*/ gByte = OS.g_bytes_new(html_bytes, html_bytes.length); + long gByte = OS.g_bytes_new(html_bytes, html_bytes.length); WebKitGTK.webkit_web_view_load_bytes (webView, gByte, mime_type_bytes, encoding_bytes, uriBytes); OS.g_bytes_unref (gByte); // as per glib/tests/keyfile:test_bytes().. OS.g_object_set (settings, WebKitGTK.user_agent, 0, 0); @@ -2967,12 +2967,12 @@ public void stop () { WebKitGTK.webkit_web_view_stop_loading (webView); } -long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ pspec) { +long webframe_notify_load_status (long web_frame, long pspec) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; int status = WebKitGTK.webkit_web_frame_get_load_status (web_frame); switch (status) { case WebKitGTK.WEBKIT_LOAD_COMMITTED: { - long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); + long uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); return handleLoadCommitted (uri, false); } case WebKitGTK.WEBKIT_LOAD_FINISHED: { @@ -2982,9 +2982,9 @@ long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ p * response to navigating to a main document containing frames) then * treat this as a completed load. */ - long /*int*/ parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame); + long parentFrame = WebKitGTK.webkit_web_frame_get_parent (web_frame); if (WebKitGTK.webkit_web_frame_get_load_status (parentFrame) == WebKitGTK.WEBKIT_LOAD_FINISHED) { - long /*int*/ uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); + long uri = WebKitGTK.webkit_web_frame_get_uri (web_frame); return handleLoadFinished (uri, false); } } @@ -3003,7 +3003,7 @@ long /*int*/ webframe_notify_load_status (long /*int*/ web_frame, long /*int*/ p * - void user_function (WebKitWebView *web_view, gpointer user_data); // observe *no* return value. * - https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#WebKitWebView-close */ -long /*int*/ webkit_close_web_view (long /*int*/ web_view) { +long webkit_close_web_view (long web_view) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -3024,11 +3024,11 @@ long /*int*/ webkit_close_web_view (long /*int*/ web_view) { return 0; } -long /*int*/ webkit_console_message (long /*int*/ web_view, long /*int*/ message, long /*int*/ line, long /*int*/ source_id) { +long webkit_console_message (long web_view, long message, long line, long source_id) { return 1; /* stop the message from being written to stderr */ } -long /*int*/ webkit_create_web_view (long /*int*/ web_view, long /*int*/ frame) { +long webkit_create_web_view (long web_view, long frame) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; @@ -3062,14 +3062,14 @@ long /*int*/ webkit_create_web_view (long /*int*/ web_view, long /*int*/ frame) return 0; } -long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ download) { +long webkit_download_requested (long web_view, long download) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; - long /*int*/ name = WebKitGTK.webkit_download_get_suggested_filename (download); + long name = WebKitGTK.webkit_download_get_suggested_filename (download); int length = C.strlen (name); byte[] bytes = new byte[length]; C.memmove (bytes, name, length); final String nameString = new String (Converter.mbcsToWcs (bytes)); - final long /*int*/ request = WebKitGTK.webkit_download_get_network_request (download); + final long request = WebKitGTK.webkit_download_get_network_request (download); OS.g_object_ref (request); /* * As of WebKitGTK 1.8.x attempting to show a FileDialog in this callback causes @@ -3084,7 +3084,7 @@ long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ down String path = dialog.open (); if (path != null) { path = URI_FILEROOT + path; - long /*int*/ newDownload = WebKitGTK.webkit_download_new (request); + long newDownload = WebKitGTK.webkit_download_new (request); byte[] uriBytes = Converter.wcsToMbcs (path, true); WebKitGTK.webkit_download_set_destination_uri (newDownload, uriBytes); openDownloadWindow (newDownload); @@ -3097,7 +3097,7 @@ long /*int*/ webkit_download_requested (long /*int*/ web_view, long /*int*/ down return 1; } -static long /*int*/ webkit_download_started(long /*int*/ webKitDownload) { +static long webkit_download_started(long webKitDownload) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; OS._g_signal_connect(webKitDownload, WebKitGTK.decide_destination, Proc3.getAddress(), DECIDE_DESTINATION); OS._g_signal_connect(webKitDownload, WebKitGTK.failed, Proc3.getAddress(), FAILED); @@ -3106,10 +3106,10 @@ static long /*int*/ webkit_download_started(long /*int*/ webKitDownload) { } -static long /*int*/ webkit_download_decide_destination(long /*int*/ webKitDownload, long /*int*/ suggested_filename) { +static long webkit_download_decide_destination(long webKitDownload, long suggested_filename) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; final String fileName = getString(suggested_filename); - long /*int*/ webView = WebKitGTK.webkit_download_get_web_view(webKitDownload); + long webView = WebKitGTK.webkit_download_get_web_view(webKitDownload); if (webView != 0) { Browser browser = FindBrowser (webView); if (browser == null || browser.isDisposed() || browser.isClosing) return 0; @@ -3133,7 +3133,7 @@ static long /*int*/ webkit_download_decide_destination(long /*int*/ webKitDownlo return 0; } -static long /*int*/ webkit_download_finished(long /*int*/ download) { +static long webkit_download_finished(long download) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; // A failed signal may have been recorded prior. The finish signal is now being called. if (!webKitDownloadStatus.containsKey(new LONG(download))) { @@ -3142,7 +3142,7 @@ static long /*int*/ webkit_download_finished(long /*int*/ download) { return 0; } -static long /*int*/ webkit_download_failed(long /*int*/ download) { +static long webkit_download_failed(long download) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; // A cancel may have been issued resulting in this signal call. Preserve the original cause. if (!webKitDownloadStatus.containsKey(new LONG(download))) { @@ -3156,11 +3156,11 @@ static long /*int*/ webkit_download_failed(long /*int*/ download) { * - void user_function (WebKitWebView *web_view, WebKitHitTestResult *hit_test_result, guint modifiers, gpointer user_data) * - https://webkitgtk.org/reference/webkit2gtk/stable/WebKitWebView.html#WebKitWebView-mouse-target-changed * */ -long /*int*/ webkit_mouse_target_changed (long /*int*/ web_view, long /*int*/ hit_test_result, long /*int*/ modifiers) { +long webkit_mouse_target_changed (long web_view, long hit_test_result, long modifiers) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; if (WebKitGTK.webkit_hit_test_result_context_is_link(hit_test_result)){ - long /*int*/ uri = WebKitGTK.webkit_hit_test_result_get_link_uri(hit_test_result); - long /*int*/ title = WebKitGTK.webkit_hit_test_result_get_link_title(hit_test_result); + long uri = WebKitGTK.webkit_hit_test_result_get_link_uri(hit_test_result); + long title = WebKitGTK.webkit_hit_test_result_get_link_title(hit_test_result); return webkit_hovering_over_link(web_view, title, uri); } @@ -3178,7 +3178,7 @@ long /*int*/ webkit_mouse_target_changed (long /*int*/ web_view, long /*int*/ hi * * Since there is no return value, it is safe to run asynchronously. */ -long /*int*/ webkit_hovering_over_link (long /*int*/ web_view, long /*int*/ title, long /*int*/ uri) { +long webkit_hovering_over_link (long web_view, long title, long uri) { if (uri != 0) { int length = C.strlen (uri); byte[] bytes = new byte[length]; @@ -3202,7 +3202,7 @@ long /*int*/ webkit_hovering_over_link (long /*int*/ web_view, long /*int*/ titl return 0; } -long /*int*/ webkit_mime_type_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ mimetype, long /*int*/ policy_decision) { +long webkit_mime_type_policy_decision_requested (long web_view, long frame, long request, long mimetype, long policy_decision) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mimetype) != 0; if (!canShow) { @@ -3213,7 +3213,7 @@ long /*int*/ webkit_mime_type_policy_decision_requested (long /*int*/ web_view, } /** Webkit1 only */ -long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, long /*int*/ frame, long /*int*/ request, long /*int*/ navigation_action, long /*int*/ policy_decision) { +long webkit_navigation_policy_decision_requested (long web_view, long frame, long request, long navigation_action, long policy_decision) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; if (loadingText) { /* @@ -3225,7 +3225,7 @@ long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, return 0; } - long /*int*/ uri = WebKitGTK.webkit_network_request_get_uri (request); + long uri = WebKitGTK.webkit_network_request_get_uri (request); int length = C.strlen (uri); byte[] bytes = new byte[length]; C.memmove (bytes, uri, length); @@ -3262,7 +3262,7 @@ long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, } /* hook status change signal if frame is a newly-created sub-frame */ - long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); if (frame != mainFrame) { int id = OS.g_signal_handler_find (frame, OS.G_SIGNAL_MATCH_FUNC | OS.G_SIGNAL_MATCH_DATA, 0, 0, 0, Proc3.getAddress (), NOTIFY_LOAD_STATUS); if (id == 0) { @@ -3286,15 +3286,15 @@ long /*int*/ webkit_navigation_policy_decision_requested (long /*int*/ web_view, } /** Webkit2 only */ -long /*int*/ webkit_decide_policy (long /*int*/ web_view, long /*int*/ decision, int decision_type, long /*int*/ user_data) { +long webkit_decide_policy (long web_view, long decision, int decision_type, long user_data) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; switch (decision_type) { case WebKitGTK.WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION: - long /*int*/ request = WebKitGTK. webkit_navigation_policy_decision_get_request(decision); + long request = WebKitGTK. webkit_navigation_policy_decision_get_request(decision); if (request == 0){ return 0; } - long /*int*/ uri = WebKitGTK.webkit_uri_request_get_uri (request); + long uri = WebKitGTK.webkit_uri_request_get_uri (request); String url = getString(uri); /* * If the URI indicates that the page is being rendered from memory @@ -3341,8 +3341,8 @@ long /*int*/ webkit_decide_policy (long /*int*/ web_view, long /*int*/ decision, case WebKitGTK.WEBKIT_POLICY_DECISION_TYPE_NEW_WINDOW_ACTION: break; case WebKitGTK.WEBKIT_POLICY_DECISION_TYPE_RESPONSE: - long /*int*/ response = WebKitGTK.webkit_response_policy_decision_get_response(decision); - long /*int*/ mime_type = WebKitGTK.webkit_uri_response_get_mime_type(response); + long response = WebKitGTK.webkit_response_policy_decision_get_response(decision); + long mime_type = WebKitGTK.webkit_uri_response_get_mime_type(response); boolean canShow = WebKitGTK.webkit_web_view_can_show_mime_type (webView, mime_type) != 0; if (!canShow) { WebKitGTK.webkit_policy_decision_download (decision); @@ -3356,16 +3356,16 @@ long /*int*/ webkit_decide_policy (long /*int*/ web_view, long /*int*/ decision, return 0; } -long /*int*/ webkit_notify_load_status (long /*int*/ web_view, long /*int*/ pspec) { +long webkit_notify_load_status (long web_view, long pspec) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; int status = WebKitGTK.webkit_web_view_get_load_status (webView); switch (status) { case WebKitGTK.WEBKIT_LOAD_COMMITTED: { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); return handleLoadCommitted (uri, true); } case WebKitGTK.WEBKIT_LOAD_FINISHED: { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); return handleLoadFinished (uri, true); } } @@ -3376,19 +3376,19 @@ long /*int*/ webkit_notify_load_status (long /*int*/ web_view, long /*int*/ pspe * This method is only called by Webkit2. * The webkit1 equivalent is webkit_window_object_cleared; */ -long /*int*/ webkit_load_changed (long /*int*/ web_view, int status, long user_data) { +long webkit_load_changed (long web_view, int status, long user_data) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; switch (status) { case WebKitGTK.WEBKIT2_LOAD_COMMITTED: { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); return handleLoadCommitted (uri, true); } case WebKitGTK.WEBKIT2_LOAD_FINISHED: { addEventHandlers (web_view, true); - long /*int*/ title = WebKitGTK.webkit_web_view_get_title (webView); + long title = WebKitGTK.webkit_web_view_get_title (webView); if (title == 0) { - long /*int*/ uri = WebKitGTK.webkit_web_view_get_uri (webView); + long uri = WebKitGTK.webkit_web_view_get_uri (webView); fireNewTitleEvent(getString(uri)); } fireProgressCompletedEvent(); @@ -3412,7 +3412,7 @@ long /*int*/ webkit_load_changed (long /*int*/ web_view, int status, long user_d prompt.setMessage(message); int result = prompt.open(); if (result == SWT.YES) { - long /*int*/ webkitcontext = WebKitGTK.webkit_web_view_get_context(web_view); + long webkitcontext = WebKitGTK.webkit_web_view_get_context(web_view); if (javaHost != null) { byte [] host = Converter.javaStringToCString(javaHost); WebKitGTK.webkit_web_context_allow_tls_certificate_for_host(webkitcontext, tlsErrorCertificate, host); @@ -3442,7 +3442,7 @@ long /*int*/ webkit_load_changed (long /*int*/ web_view, int status, long user_d * Called in cases where a web page failed to load due to TLS errors * (self-signed certificates, as an example). */ -long /*int*/ webkit_load_failed_tls (long /*int*/ web_view, long /*int*/ failing_uri, long /*int*/ certificate, long /*int*/ error) { +long webkit_load_failed_tls (long web_view, long failing_uri, long certificate, long error) { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; if (!ignoreTls) { // Set tlsError flag so that the user can be prompted once this "bad" page has finished loading @@ -3499,7 +3499,7 @@ long /*int*/ webkit_load_failed_tls (long /*int*/ web_view, long /*int*/ failing * @throws URISyntaxException if the string violates RFC 2396, or is otherwise * malformed */ -void convertUri (long /*int*/ webkitUri) { +void convertUri (long webkitUri) { try { tlsErrorUriString = Converter.cCharPtrToJavaString(webkitUri, false); tlsErrorUri = new URI (tlsErrorUriString); @@ -3518,7 +3518,7 @@ void convertUri (long /*int*/ webkitUri) { * * No return value required. Thus safe to run asynchronously. */ -long /*int*/ webkit_notify_progress (long /*int*/ web_view, long /*int*/ pspec) { +long webkit_notify_progress (long web_view, long pspec) { assert WEBKIT1 || WEBKIT2; ProgressEvent event = new ProgressEvent (browser); event.display = browser.getDisplay (); @@ -3551,9 +3551,9 @@ long /*int*/ webkit_notify_progress (long /*int*/ web_view, long /*int*/ pspec) * * It doesn't look it would require a return value, so running in asyncExec should be fine. */ -long /*int*/ webkit_notify_title (long /*int*/ web_view, long /*int*/ pspec) { +long webkit_notify_title (long web_view, long pspec) { assert WEBKIT1 || WEBKIT2; - long /*int*/ title = WebKitGTK.webkit_web_view_get_title (webView); + long title = WebKitGTK.webkit_web_view_get_title (webView); String titleString; if (title == 0) { titleString = ""; //$NON-NLS-1$ @@ -3579,7 +3579,7 @@ long /*int*/ webkit_notify_title (long /*int*/ web_view, long /*int*/ pspec) { return 0; } -long /*int*/ webkit_context_menu (long /*int*/ web_view, long /*int*/ context_menu, long /*int*/ eventXXX, long /*int*/ hit_test_result) { +long webkit_context_menu (long web_view, long context_menu, long eventXXX, long hit_test_result) { Point pt = browser.getDisplay ().getCursorLocation (); // might break on Wayland? Wouldn't hurt to verify. Event event = new Event (); event.x = pt.x; @@ -3603,7 +3603,7 @@ long /*int*/ webkit_context_menu (long /*int*/ web_view, long /*int*/ context_me } // Seems to be reached only by Webkit1 at the moment. -long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_menu) { +long webkit_populate_popup (long web_view, long webkit_menu) { Point pt = browser.getDisplay ().getCursorLocation (); Event event = new Event (); event.x = pt.x; @@ -3611,10 +3611,10 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m browser.notifyListeners (SWT.MenuDetect, event); if (!event.doit) { /* clear the menu */ - long /*int*/ children = GTK.gtk_container_get_children (webkit_menu); - long /*int*/ current = children; + long children = GTK.gtk_container_get_children (webkit_menu); + long current = children; while (current != 0) { - long /*int*/ item = OS.g_list_data (current); + long item = OS.g_list_data (current); GTK.gtk_container_remove (webkit_menu, item); current = OS.g_list_next (current); } @@ -3628,10 +3628,10 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m } menu.setVisible (true); /* clear the menu */ - long /*int*/ children = GTK.gtk_container_get_children (webkit_menu); - long /*int*/ current = children; + long children = GTK.gtk_container_get_children (webkit_menu); + long current = children; while (current != 0) { - long /*int*/ item = OS.g_list_data (current); + long item = OS.g_list_data (current); GTK.gtk_container_remove (webkit_menu, item); current = OS.g_list_next (current); } @@ -3640,7 +3640,7 @@ long /*int*/ webkit_populate_popup (long /*int*/ web_view, long /*int*/ webkit_m return 0; } -private void addRequestHeaders(long /*int*/ requestHeaders, String[] headers){ +private void addRequestHeaders(long requestHeaders, String[] headers){ for (int i = 0; i < headers.length; i++) { String current = headers[i]; if (current != null) { @@ -3659,10 +3659,10 @@ private void addRequestHeaders(long /*int*/ requestHeaders, String[] headers){ } -long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int*/ web_frame, long /*int*/ web_resource, long /*int*/ request, long /*int*/ response) { +long webkit_resource_request_starting (long web_view, long web_frame, long web_resource, long request, long response) { assert WEBKIT1; if (postData != null || headers != null) { - long /*int*/ message = WebKitGTK.webkit_network_request_get_message (request); + long message = WebKitGTK.webkit_network_request_get_message (request); if (message == 0) { headers = null; postData = null; @@ -3670,9 +3670,9 @@ long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int if (postData != null) { // Set the message method type to POST WebKitGTK.SoupMessage_method (message, PostString); - long /*int*/ body = WebKitGTK.SoupMessage_request_body (message); + long body = WebKitGTK.SoupMessage_request_body (message); byte[] bytes = Converter.wcsToMbcs (postData, false); - long /*int*/ data = C.malloc (bytes.length); + long data = C.malloc (bytes.length); C.memmove (data, bytes, bytes.length); WebKitGTK.soup_message_body_append (body, WebKitGTK.SOUP_MEMORY_TAKE, data, bytes.length); WebKitGTK.soup_message_body_flatten (body); @@ -3699,7 +3699,7 @@ long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int } /* headers */ - long /*int*/ requestHeaders = WebKitGTK.SoupMessage_request_headers (message); + long requestHeaders = WebKitGTK.SoupMessage_request_headers (message); addRequestHeaders(requestHeaders, headers); headers = null; } @@ -3716,7 +3716,7 @@ long /*int*/ webkit_resource_request_starting (long /*int*/ web_view, long /*int * In general, window.status=text is not supported on most newer browsers anymore. * status bar now only changes when you hover you mouse over it. */ -long /*int*/ webkit_status_bar_text_changed (long /*int*/ web_view, long /*int*/ text) { +long webkit_status_bar_text_changed (long web_view, long text) { int length = C.strlen (text); byte[] bytes = new byte[length]; C.memmove (bytes, text, length); @@ -3739,13 +3739,13 @@ long /*int*/ webkit_status_bar_text_changed (long /*int*/ web_view, long /*int*/ * https://webkitgtk.org/reference/webkitgtk/unstable/webkitgtk-webkitwebview.html#WebKitWebView-web-view-ready * Note in webkit2, no return value has to be provided in callback. */ -long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { +long webkit_web_view_ready (long web_view) { WindowEvent newEvent = new WindowEvent (browser); newEvent.display = browser.getDisplay (); newEvent.widget = browser; if (WEBKIT1) { - long /*int*/ webKitWebWindowFeatures = WebKitGTK.webkit_web_view_get_window_features (webView); + long webKitWebWindowFeatures = WebKitGTK.webkit_web_view_get_window_features (webView); newEvent.addressBar = webkit_settings_get(webKitWebWindowFeatures, WebKitGTK.locationbar_visible) != 0; newEvent.menuBar = webkit_settings_get(webKitWebWindowFeatures, WebKitGTK.menubar_visible) != 0; newEvent.statusBar = webkit_settings_get(webKitWebWindowFeatures, WebKitGTK.statusbar_visible) != 0; @@ -3760,7 +3760,7 @@ long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { newEvent.size = new Point (width,height); } else { assert WEBKIT2 : WebKitGTK.Webkit2AssertMsg; - long /*int*/ properties = WebKitGTK.webkit_web_view_get_window_properties(webView); + long properties = WebKitGTK.webkit_web_view_get_window_properties(webView); newEvent.addressBar = webkit_settings_get(properties, WebKitGTK.locationbar_visible) != 0; newEvent.menuBar = webkit_settings_get(properties, WebKitGTK.menubar_visible) != 0; newEvent.statusBar = webkit_settings_get(properties, WebKitGTK.statusbar_visible) != 0; @@ -3805,17 +3805,17 @@ long /*int*/ webkit_web_view_ready (long /*int*/ web_view) { * This method is only called by Webkit1. * The webkit2 equivalent is webkit_load_changed(..):caseWEBKIT2__LOAD_FINISHED */ -long /*int*/ webkit_window_object_cleared (long /*int*/ web_view, long /*int*/ frame, long /*int*/ context, long /*int*/ window_object) { +long webkit_window_object_cleared (long web_view, long frame, long context, long window_object) { assert WEBKIT1 : WebKitGTK.Webkit1AssertMsg; - long /*int*/ globalObject = WebKitGTK.JSContextGetGlobalObject (context); - long /*int*/ externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData); + long globalObject = WebKitGTK.JSContextGetGlobalObject (context); + long externalObject = WebKitGTK.JSObjectMake (context, ExternalClass, webViewData); byte[] bytes = (OBJECTNAME_EXTERNAL + '\0').getBytes (StandardCharsets.UTF_8); - long /*int*/ name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long name = WebKitGTK.JSStringCreateWithUTF8CString (bytes); WebKitGTK.JSObjectSetProperty (context, globalObject, name, externalObject, 0, null); WebKitGTK.JSStringRelease (name); registerBrowserFunctions(); // Bug 508217 - long /*int*/ mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); + long mainFrame = WebKitGTK.webkit_web_view_get_main_frame (webView); boolean top = mainFrame == frame; addEventHandlers (web_view, top); return 0; @@ -3827,13 +3827,13 @@ private int webkit_settings_get(byte [] property) { if (WEBKIT2 && webView == 0) { // already disposed. return -1; // error. } - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); return webkit_settings_get(settings, property); } /** Webkit1 & Webkit2 * @return An integer value for the property is returned. For boolean settings, 0 indicates false, 1 indicates true */ -private int webkit_settings_get(long /*int*/ settings, byte[] property) { +private int webkit_settings_get(long settings, byte[] property) { int[] result = new int[1]; OS.g_object_get (settings, property, result, 0); return result[0]; @@ -3844,7 +3844,7 @@ private void webkit_settings_set(byte [] property, int value) { if (WEBKIT2 && webView == 0) { // already disposed. return; } - long /*int*/ settings = WebKitGTK.webkit_web_view_get_settings (webView); + long settings = WebKitGTK.webkit_web_view_get_settings (webView); OS.g_object_set(settings, property, value, 0); } @@ -3857,7 +3857,7 @@ private void registerBrowserFunctions() { /** * Webkit1 callback for javascript to call java. */ -long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObject, long /*int*/ argumentCount, long /*int*/ arguments, long /*int*/ exception) { +long callJava (long ctx, long func, long thisObject, long argumentCount, long arguments, long exception) { Object returnValue = null; if (argumentCount == 3) { // Javastring array: <int: function index>, <string: token>, <array: javascript args> @@ -3904,14 +3904,14 @@ long /*int*/ callJava (long /*int*/ ctx, long /*int*/ func, long /*int*/ thisObj return convertToJS (ctx, returnValue); } -long /*int*/ convertToJS (long /*int*/ ctx, Object value) { +long convertToJS (long ctx, Object value) { if (value == null) { return WebKitGTK.JSValueMakeUndefined (ctx); } if (value instanceof String) { byte[] bytes = ((String)value + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes); - long /*int*/ result = WebKitGTK.JSValueMakeString (ctx, stringRef); + long stringRef = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long result = WebKitGTK.JSValueMakeString (ctx, stringRef); WebKitGTK.JSStringRelease (stringRef); return result; } @@ -3927,7 +3927,7 @@ long /*int*/ convertToJS (long /*int*/ ctx, Object value) { long /*int*/[] arguments = new long /*int*/[length]; for (int i = 0; i < length; i++) { Object javaObject = arrayValue[i]; - long /*int*/ jsObject = convertToJS (ctx, javaObject); + long jsObject = convertToJS (ctx, javaObject); arguments[i] = jsObject; } return WebKitGTK.JSObjectMakeArray (ctx, length, arguments, null); @@ -3936,7 +3936,7 @@ long /*int*/ convertToJS (long /*int*/ ctx, Object value) { return 0; } -static Object convertToJava (long /*int*/ ctx, long /*int*/ value) { +static Object convertToJava (long ctx, long value) { int type = WebKitGTK.JSValueGetType (ctx, value); switch (type) { case WebKitGTK.kJSTypeBoolean: { @@ -3948,9 +3948,9 @@ static Object convertToJava (long /*int*/ ctx, long /*int*/ value) { return Double.valueOf(result); } case WebKitGTK.kJSTypeString: { - long /*int*/ string = WebKitGTK.JSValueToStringCopy (ctx, value, null); + long string = WebKitGTK.JSValueToStringCopy (ctx, value, null); if (string == 0) return ""; //$NON-NLS-1$ - long /*int*/ length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string); + long length = WebKitGTK.JSStringGetMaximumUTF8CStringSize (string); byte[] bytes = new byte[(int)/*64*/length]; length = WebKitGTK.JSStringGetUTF8CString (string, bytes, length); WebKitGTK.JSStringRelease (string); @@ -3962,15 +3962,15 @@ static Object convertToJava (long /*int*/ ctx, long /*int*/ value) { case WebKitGTK.kJSTypeUndefined: return null; case WebKitGTK.kJSTypeObject: { byte[] bytes = (PROPERTY_LENGTH + '\0').getBytes (StandardCharsets.UTF_8); //$NON-NLS-1$ - long /*int*/ propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes); - long /*int*/ valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null); + long propertyName = WebKitGTK.JSStringCreateWithUTF8CString (bytes); + long valuePtr = WebKitGTK.JSObjectGetProperty (ctx, value, propertyName, null); WebKitGTK.JSStringRelease (propertyName); type = WebKitGTK.JSValueGetType (ctx, valuePtr); if (type == WebKitGTK.kJSTypeNumber) { int length = (int)WebKitGTK.JSValueToNumber (ctx, valuePtr, null); Object[] result = new Object[length]; for (int i = 0; i < length; i++) { - long /*int*/ current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null); + long current = WebKitGTK.JSObjectGetPropertyAtIndex (ctx, value, i, null); if (current != 0) { result[i] = convertToJava (ctx, current); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java index d7ec16e391..17d0802672 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebkitGDBus.java @@ -46,7 +46,7 @@ class WebkitGDBus { private static final String webkitWebExtensionIdentifier = WebKit.Webkit2Extension.getWebExtensionIdentifer(); /** Proxy connection to the web extension.*/ - static long /*int*/ proxy; + static long proxy; /** A field that is set to true if the proxy connection has been established, false otherwise */ static boolean proxyToExtension; /** Set to true if there are <code>BrowserFunction</code> objects waiting to be registered with the web extension.*/ @@ -178,12 +178,12 @@ class WebkitGDBus { * @return void. */ @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onBusAcquiredCallback (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { - long /*int*/ gdBusNodeInfo; + private static long onBusAcquiredCallback (long connection, long name, long user_data) { + long gdBusNodeInfo; // Parse XML { - long /*int*/ [] error = new long /*int*/ [1]; + long [] error = new long [1]; gdBusNodeInfo = OS.g_dbus_node_info_new_for_xml(Converter.javaStringToCString(dbus_introspection_xml), error); if (gdBusNodeInfo == 0 || error[0] != 0) { System.err.println("SWT WebkitGDBus: Failed to get introspection data"); @@ -193,9 +193,9 @@ class WebkitGDBus { // Register object { - long /*int*/ [] error = new long /*int*/ [1]; - long /*int*/ interface_info = OS.g_dbus_node_info_lookup_interface(gdBusNodeInfo, Converter.javaStringToCString(INTERFACE_NAME)); - long /*int*/ vtable [] = { handleMethodCallback.getAddress(), 0, 0 }; + long [] error = new long [1]; + long interface_info = OS.g_dbus_node_info_lookup_interface(gdBusNodeInfo, Converter.javaStringToCString(INTERFACE_NAME)); + long vtable [] = { handleMethodCallback.getAddress(), 0, 0 }; // SWT Dev Note: SWT Tool's "32/64 bit" checking mechanism sometimes get's confused by this method signature and shows an incorrect warning. // Other times it validates it fine. We ignore for now as 32bit will be dropped anyway. OS.g_dbus_connection_register_object( @@ -225,14 +225,14 @@ class WebkitGDBus { @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onNameAcquiredCallback (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { + private static long onNameAcquiredCallback (long connection, long name, long user_data) { // Currently not used, but can be used if acquring the gdbus name should trigger something to load. return 0; } @SuppressWarnings("unused") // Callback Only called directly by JNI. - private static long /*int*/ onNameLostCallback (long /*int*/ connection, long /*int*/ name, long /*int*/ user_data) { + private static long onNameLostCallback (long connection, long name, long user_data) { assert false : "This code should never have executed"; System.err.println("SWT WebkitGDBus.java: Lost GDBus name. This should never occur"); return 0; @@ -259,11 +259,11 @@ class WebkitGDBus { * @return */ @SuppressWarnings("unused") // Callback only called directly by JNI. - private static long /*int*/ handleMethodCallback ( - long /*int*/ connection, long /*int*/ sender, - long /*int*/ object_path, long /*int*/ interface_name, - long /*int*/ method_name, long /*int*/ gvar_parameters, - long /*int*/ invocation, long /*int*/ user_data) { + private static long handleMethodCallback ( + long connection, long sender, + long object_path, long interface_name, + long method_name, long gvar_parameters, + long invocation, long user_data) { String java_method_name = Converter.cCharPtrToJavaString(method_name, false); Object result = null; @@ -299,11 +299,11 @@ class WebkitGDBus { } @SuppressWarnings("unused") - private static long /*int*/ callExtensionAsyncCallback (long /*int*/ source_object, long /*int*/ res, long /*int*/ user_data) { + private static long callExtensionAsyncCallback (long source_object, long res, long user_data) { long /*int*/[] gerror = new long /*int*/[1]; - long /*int*/ result = OS.g_dbus_proxy_call_finish (proxy, res, gerror); + long result = OS.g_dbus_proxy_call_finish (proxy, res, gerror); if (gerror[0] != 0){ - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); System.err.println("SWT webkit: There was an error executing something asynchronously with the extension (Java callback)."); System.err.println("SWT webkit: the error message provided is " + msg); @@ -323,10 +323,10 @@ class WebkitGDBus { * @param invocation the GDBus invocation to return the value on */ private static void invokeReturnValueExtensionIdentifier (HashMap<Long, ArrayList<ArrayList<String>>> map, - long /*int*/ invocation) { - long /*int*/ resultGVariant; - long /*int*/ builder; - long /*int*/ type = OS.g_variant_type_new(OS.G_VARIANT_TYPE_ARRAY_BROWSER_FUNCS); + long invocation) { + long resultGVariant; + long builder; + long type = OS.g_variant_type_new(OS.G_VARIANT_TYPE_ARRAY_BROWSER_FUNCS); builder = OS.g_variant_builder_new(type); if (builder == 0) return; Object [] tupleArray = new Object[3]; @@ -343,7 +343,7 @@ class WebkitGDBus { tupleArray[0] = (long)-1; tupleArray[1] = ""; tupleArray[2] = ""; - long /*int*/ tupleGVariant = convertJavaToGVariant(tupleArray); + long tupleGVariant = convertJavaToGVariant(tupleArray); if (tupleGVariant != 0) { OS.g_variant_builder_add_value(builder, tupleGVariant); } else { @@ -361,7 +361,7 @@ class WebkitGDBus { } tupleArray[0] = id; System.arraycopy(stringArray, 0, tupleArray, 1, 2); - long /*int*/ tupleGVariant = convertJavaToGVariant(tupleArray); + long tupleGVariant = convertJavaToGVariant(tupleArray); if (tupleGVariant != 0) { OS.g_variant_builder_add_value(builder, tupleGVariant); } else { @@ -376,15 +376,15 @@ class WebkitGDBus { if (!OS.DBUS_TYPE_STRUCT_ARRAY_BROWSER_FUNCS.equals(typeString)) { System.err.println("An error packaging the GVariant occurred: type mismatch."); } - long /*int*/ [] variants = {resultGVariant}; - long /*int*/ finalGVariant = OS.g_variant_new_tuple(variants, 1); + long [] variants = {resultGVariant}; + long finalGVariant = OS.g_variant_new_tuple(variants, 1); OS.g_dbus_method_invocation_return_value(invocation, finalGVariant); OS.g_variant_builder_unref(builder); return; } - private static void invokeReturnValue (Object result, long /*int*/ invocation) { - long /*int*/ resultGVariant = 0; + private static void invokeReturnValue (Object result, long invocation) { + long resultGVariant = 0; try { resultGVariant = convertJavaToGVariant(new Object [] {result}); // Result has to be a tuple. } catch (SWTException e) { @@ -407,13 +407,13 @@ class WebkitGDBus { return true; } else { if (EXTENSION_DBUS_NAME != null && EXTENSION_DBUS_PATH != null) { - long /*int*/ [] error = new long /*int*/ [1]; + long [] error = new long [1]; byte [] name = Converter.javaStringToCString(EXTENSION_DBUS_NAME); byte [] path = Converter.javaStringToCString(EXTENSION_DBUS_PATH); byte [] interfaceName = Converter.javaStringToCString(EXTENSION_INTERFACE_NAME); proxy = OS.g_dbus_proxy_new_for_bus_sync(OS.G_BUS_TYPE_SESSION, OS.G_DBUS_PROXY_FLAGS_NONE, 0, name, path, interfaceName, 0, error); if (error[0] != 0) { - long /*int*/ errMsg = OS.g_error_get_message(error[0]); + long errMsg = OS.g_error_get_message(error[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); OS.g_error_free(error[0]); System.err.println("SWT webkit: there was an error establishing the proxy connection to the extension. " + @@ -435,12 +435,12 @@ class WebkitGDBus { * @param methodName a String representing the DBus method name in the extension * @return an Object representing the return value from DBus in boolean form */ - static Object callExtensionSync (long /*int*/ params, String methodName) { - long /*int*/[] gerror = new long /*int*/ [1]; // GError ** - long /*int*/ gVariant = OS.g_dbus_proxy_call_sync(proxy, Converter.javaStringToCString(methodName), + static Object callExtensionSync (long params, String methodName) { + long /*int*/[] gerror = new long [1]; // GError ** + long gVariant = OS.g_dbus_proxy_call_sync(proxy, Converter.javaStringToCString(methodName), params, OS.G_DBUS_CALL_FLAGS_NO_AUTO_START, 1000, 0, gerror); if (gerror[0] != 0) { - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); /* * Don't print console warnings for timeout errors, as we can handle these ourselves. @@ -471,12 +471,12 @@ class WebkitGDBus { * @param methodName a String representing the DBus method name in the extension * @return true if the extension was called without errors, false otherwise */ - static boolean callExtensionAsync (long /*int*/ params, String methodName) { - long /*int*/[] gerror = new long /*int*/ [1]; // GError ** + static boolean callExtensionAsync (long params, String methodName) { + long /*int*/[] gerror = new long [1]; // GError ** OS.g_dbus_proxy_call(proxy, Converter.javaStringToCString(methodName), params, OS.G_DBUS_CALL_FLAGS_NO_AUTO_START, 1000, 0, callExtensionAsyncCallback.getAddress(), gerror); if (gerror[0] != 0) { - long /*int*/ errMsg = OS.g_error_get_message(gerror[0]); + long errMsg = OS.g_error_get_message(gerror[0]); String msg = Converter.cCharPtrToJavaString(errMsg, false); System.err.println("SWT webkit: There was an error executing something asynchronously with the extension."); System.err.println("SWT webkit: The error message is: " + msg); @@ -512,7 +512,7 @@ class WebkitGDBus { * * @param gVariant a pointer to the native GVariant */ - private static Object convertGVariantToJava(long /*int*/ gVariant){ + private static Object convertGVariantToJava(long gVariant){ if (OS.g_variant_is_of_type(gVariant, OS.G_VARIANT_TYPE_BOOLEAN)){ return new Boolean(OS.g_variant_get_boolean(gVariant)); @@ -567,7 +567,7 @@ class WebkitGDBus { * * @return pointer GVariant * */ - private static long /*int*/ convertJavaToGVariant(Object javaObject) throws SWTException { + private static long convertJavaToGVariant(Object javaObject) throws SWTException { if (javaObject == null) { return OS.g_variant_new_byte(WebkitGDBus.SWT_DBUS_MAGIC_NUMBER_NULL); // see: WebKitGTK.java 'TYPE NOTES' @@ -599,7 +599,7 @@ class WebkitGDBus { return OS.g_variant_new_byte(WebkitGDBus.SWT_DBUS_MAGIC_NUMBER_EMPTY_ARRAY); // see: WebKitGTK.java 'TYPE NOTES' } - long /*int*/ variants[] = new long /*int*/[length]; + long variants[] = new long /*int*/[length]; for (int i = 0; i < length; i++) { variants[i] = convertJavaToGVariant(arrayValue[i]); diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java index 72f18a4681..a138b8eb5b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/JSClassDefinition.java @@ -19,35 +19,35 @@ public class JSClassDefinition { public int version; public int attributes; /** @field cast=(const char*) */ - public long /*int*/ className; + public long className; /** @field cast=(void*) */ - public long /*int*/ parentClass; + public long parentClass; /** @field cast=(const void*) */ - public long /*int*/ staticValues; + public long staticValues; /** @field cast=(const void*) */ - public long /*int*/ staticFunctions; + public long staticFunctions; /** @field cast=(void*) */ - public long /*int*/ initialize; + public long initialize; /** @field cast=(void*) */ - public long /*int*/ finalize; + public long finalize; /** @field cast=(void*) */ - public long /*int*/ hasProperty; + public long hasProperty; /** @field cast=(void*) */ - public long /*int*/ getProperty; + public long getProperty; /** @field cast=(void*) */ - public long /*int*/ setProperty; + public long setProperty; /** @field cast=(void*) */ - public long /*int*/ deleteProperty; + public long deleteProperty; /** @field cast=(void*) */ - public long /*int*/ getPropertyNames; + public long getPropertyNames; /** @field cast=(void*) */ - public long /*int*/ callAsFunction; + public long callAsFunction; /** @field cast=(void*) */ - public long /*int*/ callAsConstructor; + public long callAsConstructor; /** @field cast=(void*) */ - public long /*int*/ hasInstance; + public long hasInstance; /** @field cast=(void*) */ - public long /*int*/ convertToType; + public long convertToType; public static final int sizeof = WebKitGTK.JSClassDefinition_sizeof(); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java index 893688b5e3..92a7ba78bf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/WebKitGTK.java @@ -243,8 +243,8 @@ public class WebKitGTK extends C { /** @method flags=dynamic */ -public static final native long /*int*/ _JSClassCreate (long /*int*/ definition); -public static final long /*int*/ JSClassCreate (long /*int*/ definition) { +public static final native long _JSClassCreate (long definition); +public static final long JSClassCreate (long definition) { lock.lock(); try { return _JSClassCreate (definition); @@ -254,8 +254,8 @@ public static final long /*int*/ JSClassCreate (long /*int*/ definition) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSContextGetGlobalObject (long /*int*/ ctx); -public static final long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx) { +public static final native long _JSContextGetGlobalObject (long ctx); +public static final long JSContextGetGlobalObject (long ctx) { lock.lock(); try { return _JSContextGetGlobalObject (ctx); @@ -265,8 +265,8 @@ public static final long /*int*/ JSContextGetGlobalObject (long /*int*/ ctx) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception); -public static final long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int*/ script, long /*int*/ thisObject, long /*int*/ sourceURL, int startingLineNumber, long /*int*/[] exception) { +public static final native long _JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long /*int*/[] exception); +public static final long JSEvaluateScript (long ctx, long script, long thisObject, long sourceURL, int startingLineNumber, long /*int*/[] exception) { lock.lock(); try { return _JSEvaluateScript (ctx, script, thisObject, sourceURL, startingLineNumber, exception); @@ -276,8 +276,8 @@ public static final long /*int*/ JSEvaluateScript (long /*int*/ ctx, long /*int* } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectGetPrivate (long /*int*/ object); -public static final long /*int*/ JSObjectGetPrivate (long /*int*/ object) { +public static final native long _JSObjectGetPrivate (long object); +public static final long JSObjectGetPrivate (long object) { lock.lock(); try { return _JSObjectGetPrivate (object); @@ -287,8 +287,8 @@ public static final long /*int*/ JSObjectGetPrivate (long /*int*/ object) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception); -public static final long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/[] exception) { +public static final native long _JSObjectGetProperty (long ctx, long object, long propertyName, long /*int*/[] exception); +public static final long JSObjectGetProperty (long ctx, long object, long propertyName, long /*int*/[] exception) { lock.lock(); try { return _JSObjectGetProperty (ctx, object, propertyName, exception); @@ -298,8 +298,8 @@ public static final long /*int*/ JSObjectGetProperty (long /*int*/ ctx, long /*i } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception); -public static final long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, long /*int*/ object, int propertyIndex, long /*int*/[] exception) { +public static final native long _JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long /*int*/[] exception); +public static final long JSObjectGetPropertyAtIndex (long ctx, long object, int propertyIndex, long /*int*/[] exception) { lock.lock(); try { return _JSObjectGetPropertyAtIndex (ctx, object, propertyIndex, exception); @@ -309,8 +309,8 @@ public static final long /*int*/ JSObjectGetPropertyAtIndex (long /*int*/ ctx, l } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data); -public static final long /*int*/ JSObjectMake (long /*int*/ ctx, long /*int*/ jsClass, long /*int*/ data) { +public static final native long _JSObjectMake (long ctx, long jsClass, long data); +public static final long JSObjectMake (long ctx, long jsClass, long data) { lock.lock(); try { return _JSObjectMake (ctx, jsClass, data); @@ -320,8 +320,8 @@ public static final long /*int*/ JSObjectMake (long /*int*/ ctx, long /*int*/ js } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception); -public static final long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int*/ argumentCount, long /*int*/[] arguments, long /*int*/[] exception) { +public static final native long _JSObjectMakeArray (long ctx, long argumentCount, long /*int*/[] arguments, long /*int*/[] exception); +public static final long JSObjectMakeArray (long ctx, long argumentCount, long /*int*/[] arguments, long /*int*/[] exception) { lock.lock(); try { return _JSObjectMakeArray (ctx, argumentCount, arguments, exception); @@ -331,8 +331,8 @@ public static final long /*int*/ JSObjectMakeArray (long /*int*/ ctx, long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction); -public static final long /*int*/ JSObjectMakeFunctionWithCallback (long /*int*/ ctx, long /*int*/ name, long /*int*/ callAsFunction) { +public static final native long _JSObjectMakeFunctionWithCallback (long ctx, long name, long callAsFunction); +public static final long JSObjectMakeFunctionWithCallback (long ctx, long name, long callAsFunction) { lock.lock(); try { return _JSObjectMakeFunctionWithCallback (ctx, name, callAsFunction); @@ -342,8 +342,8 @@ public static final long /*int*/ JSObjectMakeFunctionWithCallback (long /*int*/ } /** @method flags=dynamic */ -public static final native void _JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception); -public static final void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ object, long /*int*/ propertyName, long /*int*/ value, int attributes, long /*int*/[] exception) { +public static final native void _JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long /*int*/[] exception); +public static final void JSObjectSetProperty (long ctx, long object, long propertyName, long value, int attributes, long /*int*/[] exception) { lock.lock(); try { _JSObjectSetProperty (ctx, object, propertyName, value, attributes, exception); @@ -353,8 +353,8 @@ public static final void JSObjectSetProperty (long /*int*/ ctx, long /*int*/ obj } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringCreateWithUTF8CString (byte[] string); -public static final long /*int*/ JSStringCreateWithUTF8CString (byte[] string) { +public static final native long _JSStringCreateWithUTF8CString (byte[] string); +public static final long JSStringCreateWithUTF8CString (byte[] string) { lock.lock(); try { return _JSStringCreateWithUTF8CString (string); @@ -364,8 +364,8 @@ public static final long /*int*/ JSStringCreateWithUTF8CString (byte[] string) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringGetLength (long /*int*/ string); -public static final long /*int*/ JSStringGetLength (long /*int*/ string) { +public static final native long _JSStringGetLength (long string); +public static final long JSStringGetLength (long string) { lock.lock(); try { return _JSStringGetLength (string); @@ -375,8 +375,8 @@ public static final long /*int*/ JSStringGetLength (long /*int*/ string) { } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringGetMaximumUTF8CStringSize (long /*int*/ string); -public static final long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ string) { +public static final native long _JSStringGetMaximumUTF8CStringSize (long string); +public static final long JSStringGetMaximumUTF8CStringSize (long string) { lock.lock(); try { return _JSStringGetMaximumUTF8CStringSize (string); @@ -386,8 +386,8 @@ public static final long /*int*/ JSStringGetMaximumUTF8CStringSize (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize); -public static final long /*int*/ JSStringGetUTF8CString (long /*int*/ string, byte[] buffer, long /*int*/ bufferSize) { +public static final native long _JSStringGetUTF8CString (long string, byte[] buffer, long bufferSize); +public static final long JSStringGetUTF8CString (long string, byte[] buffer, long bufferSize) { lock.lock(); try { return _JSStringGetUTF8CString (string, buffer, bufferSize); @@ -397,8 +397,8 @@ public static final long /*int*/ JSStringGetUTF8CString (long /*int*/ string, by } /** @method flags=dynamic */ -public static final native int _JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b); -public static final int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b) { +public static final native int _JSStringIsEqualToUTF8CString (long a, byte[] b); +public static final int JSStringIsEqualToUTF8CString (long a, byte[] b) { lock.lock(); try { return _JSStringIsEqualToUTF8CString (a, b); @@ -408,8 +408,8 @@ public static final int JSStringIsEqualToUTF8CString (long /*int*/ a, byte[] b) } /** @method flags=dynamic */ -public static final native void _JSStringRelease (long /*int*/ string); -public static final void JSStringRelease (long /*int*/ string) { +public static final native void _JSStringRelease (long string); +public static final void JSStringRelease (long string) { lock.lock(); try { _JSStringRelease (string); @@ -421,8 +421,8 @@ public static final void JSStringRelease (long /*int*/ string) { // Signature: void webkit_javascript_result_unref (WebKitJavascriptResult *js_result); // Type Note: WebKitJavascriptResult -> gpointer -> jintLong /** @method flags=dynamic */ -public static final native void _webkit_javascript_result_unref(long /*int*/ js_result); -public static final void webkit_javascript_result_unref(long /*int*/ js_result) { +public static final native void _webkit_javascript_result_unref(long js_result); +public static final void webkit_javascript_result_unref(long js_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -433,8 +433,8 @@ public static final void webkit_javascript_result_unref(long /*int*/ js_result) } /** @method flags=dynamic */ -public static final native int _JSValueGetType (long /*int*/ ctx, long /*int*/ value); -public static final int JSValueGetType (long /*int*/ ctx, long /*int*/ value) { +public static final native int _JSValueGetType (long ctx, long value); +public static final int JSValueGetType (long ctx, long value) { lock.lock(); try { return _JSValueGetType (ctx, value); @@ -444,8 +444,8 @@ public static final int JSValueGetType (long /*int*/ ctx, long /*int*/ value) { } /** @method flags=dynamic */ -public static final native int _JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass); -public static final int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ value, long /*int*/ jsClass) { +public static final native int _JSValueIsObjectOfClass (long ctx, long value, long jsClass); +public static final int JSValueIsObjectOfClass (long ctx, long value, long jsClass) { lock.lock(); try { return _JSValueIsObjectOfClass (ctx, value, jsClass); @@ -455,8 +455,8 @@ public static final int JSValueIsObjectOfClass (long /*int*/ ctx, long /*int*/ v } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeBoolean (long /*int*/ ctx, int bool); -public static final long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, int bool) { +public static final native long _JSValueMakeBoolean (long ctx, int bool); +public static final long JSValueMakeBoolean (long ctx, int bool) { lock.lock(); try { return _JSValueMakeBoolean (ctx, bool); @@ -466,8 +466,8 @@ public static final long /*int*/ JSValueMakeBoolean (long /*int*/ ctx, int bool) } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeNumber (long /*int*/ ctx, double number); -public static final long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double number) { +public static final native long _JSValueMakeNumber (long ctx, double number); +public static final long JSValueMakeNumber (long ctx, double number) { lock.lock(); try { return _JSValueMakeNumber (ctx, number); @@ -477,8 +477,8 @@ public static final long /*int*/ JSValueMakeNumber (long /*int*/ ctx, double num } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeString (long /*int*/ ctx, long /*int*/ string); -public static final long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int*/ string) { +public static final native long _JSValueMakeString (long ctx, long string); +public static final long JSValueMakeString (long ctx, long string) { lock.lock(); try { return _JSValueMakeString (ctx, string); @@ -488,8 +488,8 @@ public static final long /*int*/ JSValueMakeString (long /*int*/ ctx, long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueMakeUndefined (long /*int*/ ctx); -public static final long /*int*/ JSValueMakeUndefined (long /*int*/ ctx) { +public static final native long _JSValueMakeUndefined (long ctx); +public static final long JSValueMakeUndefined (long ctx) { lock.lock(); try { return _JSValueMakeUndefined (ctx); @@ -499,8 +499,8 @@ public static final long /*int*/ JSValueMakeUndefined (long /*int*/ ctx) { } /** @method flags=dynamic */ -public static final native double _JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); -public static final double JSValueToNumber (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) { +public static final native double _JSValueToNumber (long ctx, long value, long /*int*/[] exception); +public static final double JSValueToNumber (long ctx, long value, long /*int*/[] exception) { lock.lock(); try { return _JSValueToNumber (ctx, value, exception); @@ -510,8 +510,8 @@ public static final double JSValueToNumber (long /*int*/ ctx, long /*int*/ value } /** @method flags=dynamic */ -public static final native long /*int*/ _JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception); -public static final long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*int*/ value, long /*int*/[] exception) { +public static final native long _JSValueToStringCopy (long ctx, long value, long /*int*/[] exception); +public static final long JSValueToStringCopy (long ctx, long value, long /*int*/[] exception) { lock.lock(); try { return _JSValueToStringCopy (ctx, value, exception); @@ -523,8 +523,8 @@ public static final long /*int*/ JSValueToStringCopy (long /*int*/ ctx, long /*i /* --------------------- start libsoup natives --------------------- */ /** @method flags=dynamic */ -public static final native void _soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password); -public static final void soup_auth_authenticate (long /*int*/ auth, byte[] username, byte[] password) { +public static final native void _soup_auth_authenticate (long auth, byte[] username, byte[] password); +public static final void soup_auth_authenticate (long auth, byte[] username, byte[] password) { lock.lock(); try { _soup_auth_authenticate (auth, username, password); @@ -534,8 +534,8 @@ public static final void soup_auth_authenticate (long /*int*/ auth, byte[] usern } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_auth_get_host (long /*int*/ auth); -public static final long /*int*/ soup_auth_get_host (long /*int*/ auth) { +public static final native long _soup_auth_get_host (long auth); +public static final long soup_auth_get_host (long auth) { lock.lock(); try { return _soup_auth_get_host (auth); @@ -545,8 +545,8 @@ public static final long /*int*/ soup_auth_get_host (long /*int*/ auth) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_auth_get_scheme_name (long /*int*/ auth); -public static final long /*int*/ soup_auth_get_scheme_name (long /*int*/ auth) { +public static final native long _soup_auth_get_scheme_name (long auth); +public static final long soup_auth_get_scheme_name (long auth) { lock.lock(); try { return _soup_auth_get_scheme_name (auth); @@ -556,8 +556,8 @@ public static final long /*int*/ soup_auth_get_scheme_name (long /*int*/ auth) { } /** @method flags=dynamic */ -public static final native void _soup_cookie_free (long /*int*/ cookie); -public static final void soup_cookie_free (long /*int*/ cookie) { +public static final native void _soup_cookie_free (long cookie); +public static final void soup_cookie_free (long cookie) { lock.lock(); try { _soup_cookie_free (cookie); @@ -567,8 +567,8 @@ public static final void soup_cookie_free (long /*int*/ cookie) { } /** @method flags=dynamic */ -public static final native void _soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie); -public static final void soup_cookie_jar_add_cookie (long /*int*/ jar, long /*int*/ cookie) { +public static final native void _soup_cookie_jar_add_cookie (long jar, long cookie); +public static final void soup_cookie_jar_add_cookie (long jar, long cookie) { lock.lock(); try { _soup_cookie_jar_add_cookie (jar, cookie); @@ -578,8 +578,8 @@ public static final void soup_cookie_jar_add_cookie (long /*int*/ jar, long /*in } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_jar_all_cookies (long /*int*/ jar); -public static final long /*int*/ soup_cookie_jar_all_cookies (long /*int*/ jar) { +public static final native long _soup_cookie_jar_all_cookies (long jar); +public static final long soup_cookie_jar_all_cookies (long jar) { lock.lock(); try { return _soup_cookie_jar_all_cookies (jar); @@ -589,8 +589,8 @@ public static final long /*int*/ soup_cookie_jar_all_cookies (long /*int*/ jar) } /** @method flags=dynamic */ -public static final native void _soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie); -public static final void soup_cookie_jar_delete_cookie (long /*int*/ jar, long /*int*/ cookie) { +public static final native void _soup_cookie_jar_delete_cookie (long jar, long cookie); +public static final void soup_cookie_jar_delete_cookie (long jar, long cookie) { lock.lock(); try { _soup_cookie_jar_delete_cookie (jar, cookie); @@ -600,8 +600,8 @@ public static final void soup_cookie_jar_delete_cookie (long /*int*/ jar, long / } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http); -public static final long /*int*/ soup_cookie_jar_get_cookies (long /*int*/ jar, long /*int*/ uri, int for_http) { +public static final native long _soup_cookie_jar_get_cookies (long jar, long uri, int for_http); +public static final long soup_cookie_jar_get_cookies (long jar, long uri, int for_http) { lock.lock(); try { return _soup_cookie_jar_get_cookies (jar, uri, for_http); @@ -611,8 +611,8 @@ public static final long /*int*/ soup_cookie_jar_get_cookies (long /*int*/ jar, } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_jar_get_type (); -public static final long /*int*/ soup_cookie_jar_get_type () { +public static final native long _soup_cookie_jar_get_type (); +public static final long soup_cookie_jar_get_type () { lock.lock(); try { return _soup_cookie_jar_get_type (); @@ -622,8 +622,8 @@ public static final long /*int*/ soup_cookie_jar_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_cookie_parse (byte[] header, long /*int*/ origin); -public static final long /*int*/ soup_cookie_parse (byte[] header, long /*int*/ origin) { +public static final native long _soup_cookie_parse (byte[] header, long origin); +public static final long soup_cookie_parse (byte[] header, long origin) { lock.lock(); try { return _soup_cookie_parse (header, origin); @@ -633,8 +633,8 @@ public static final long /*int*/ soup_cookie_parse (byte[] header, long /*int*/ } /** @method flags=dynamic */ -public static final native void _soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length); -public static final void soup_message_body_append (long /*int*/ body, int use, long /*int*/ data, long /*int*/ length) { +public static final native void _soup_message_body_append (long body, int use, long data, long length); +public static final void soup_message_body_append (long body, int use, long data, long length) { lock.lock(); try { _soup_message_body_append (body, use, data, length); @@ -644,8 +644,8 @@ public static final void soup_message_body_append (long /*int*/ body, int use, l } /** @method flags=dynamic */ -public static final native void _soup_message_body_flatten (long /*int*/ body); -public static final void soup_message_body_flatten (long /*int*/ body) { +public static final native void _soup_message_body_flatten (long body); +public static final void soup_message_body_flatten (long body) { lock.lock(); try { _soup_message_body_flatten (body); @@ -655,8 +655,8 @@ public static final void soup_message_body_flatten (long /*int*/ body) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_message_get_uri (long /*int*/ msg); -public static final long /*int*/ soup_message_get_uri (long /*int*/ msg) { +public static final native long _soup_message_get_uri (long msg); +public static final long soup_message_get_uri (long msg) { lock.lock(); try { return _soup_message_get_uri (msg); @@ -666,8 +666,8 @@ public static final long /*int*/ soup_message_get_uri (long /*int*/ msg) { } /** @method flags=dynamic */ -public static final native void _soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value); -public static final void soup_message_headers_append (long /*int*/ headers, byte[] name, byte[] value) { +public static final native void _soup_message_headers_append (long headers, byte[] name, byte[] value); +public static final void soup_message_headers_append (long headers, byte[] name, byte[] value) { lock.lock(); try { _soup_message_headers_append (headers, name, value); @@ -677,8 +677,8 @@ public static final void soup_message_headers_append (long /*int*/ headers, byte } /** @method flags=dynamic */ -public static final native void _soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type); -public static final void soup_session_add_feature_by_type (long /*int*/ session, long /*int*/ type) { +public static final native void _soup_session_add_feature_by_type (long session, long type); +public static final void soup_session_add_feature_by_type (long session, long type) { lock.lock(); try { _soup_session_add_feature_by_type (session, type); @@ -688,8 +688,8 @@ public static final void soup_session_add_feature_by_type (long /*int*/ session, } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type); -public static final long /*int*/ soup_session_get_feature (long /*int*/ session, long /*int*/ feature_type) { +public static final native long _soup_session_get_feature (long session, long feature_type); +public static final long soup_session_get_feature (long session, long feature_type) { lock.lock(); try { return _soup_session_get_feature (session, feature_type); @@ -699,8 +699,8 @@ public static final long /*int*/ soup_session_get_feature (long /*int*/ session, } /** @method flags=dynamic */ -public static final native void _soup_session_feature_attach (long /*int*/ feature, long /*int*/ session); -public static final void soup_session_feature_attach (long /*int*/ feature, long /*int*/ session) { +public static final native void _soup_session_feature_attach (long feature, long session); +public static final void soup_session_feature_attach (long feature, long session) { lock.lock(); try { _soup_session_feature_attach (feature, session); @@ -710,8 +710,8 @@ public static final void soup_session_feature_attach (long /*int*/ feature, long } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_session_get_type (); -public static final long /*int*/ soup_session_get_type () { +public static final native long _soup_session_get_type (); +public static final long soup_session_get_type () { lock.lock(); try { return _soup_session_get_type (); @@ -721,8 +721,8 @@ public static final long /*int*/ soup_session_get_type () { } /** @method flags=dynamic */ -public static final native void _soup_session_feature_detach (long /*int*/ feature, long /*int*/ session); -public static final void soup_session_feature_detach (long /*int*/ feature, long /*int*/ session) { +public static final native void _soup_session_feature_detach (long feature, long session); +public static final void soup_session_feature_detach (long feature, long session) { lock.lock(); try { _soup_session_feature_detach (feature, session); @@ -732,8 +732,8 @@ public static final void soup_session_feature_detach (long /*int*/ feature, long } /** @method flags=dynamic */ -public static final native void _soup_uri_free (long /*int*/ uri); -public static final void soup_uri_free (long /*int*/ uri) { +public static final native void _soup_uri_free (long uri); +public static final void soup_uri_free (long uri) { lock.lock(); try { _soup_uri_free (uri); @@ -743,8 +743,8 @@ public static final void soup_uri_free (long /*int*/ uri) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_uri_new (byte[] uri_string); -public static final long /*int*/ soup_uri_new (byte[] uri_string) { +public static final native long _soup_uri_new (byte[] uri_string); +public static final long soup_uri_new (byte[] uri_string) { lock.lock(); try { return _soup_uri_new (uri_string); @@ -754,8 +754,8 @@ public static final long /*int*/ soup_uri_new (byte[] uri_string) { } /** @method flags=dynamic */ -public static final native long /*int*/ _soup_uri_to_string (long /*int*/ uri, int just_path_and_query); -public static final long /*int*/ soup_uri_to_string (long /*int*/ uri, int just_path_and_query) { +public static final native long _soup_uri_to_string (long uri, int just_path_and_query); +public static final long soup_uri_to_string (long uri, int just_path_and_query) { lock.lock(); try { return _soup_uri_to_string (uri, just_path_and_query); @@ -767,8 +767,8 @@ public static final long /*int*/ soup_uri_to_string (long /*int*/ uri, int just_ /* --------------------- start WebKitGTK natives --------------------- */ /** @method flags=dynamic */ -public static final native void _webkit_authentication_request_authenticate (long /*int*/ request, long /*int*/ credential); -public static final void webkit_authentication_request_authenticate (long /*int*/ request, long /*int*/ credential) { +public static final native void _webkit_authentication_request_authenticate (long request, long credential); +public static final void webkit_authentication_request_authenticate (long request, long credential) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -779,8 +779,8 @@ public static final void webkit_authentication_request_authenticate (long /*int* } /** @method flags=dynamic */ -public static final native void _webkit_authentication_request_cancel (long /*int*/ request); -public static final void webkit_authentication_request_cancel (long /*int*/ request) { +public static final native void _webkit_authentication_request_cancel (long request); +public static final void webkit_authentication_request_cancel (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -791,8 +791,8 @@ public static final void webkit_authentication_request_cancel (long /*int*/ requ } /** @method flags=dynamic */ -public static final native boolean _webkit_authentication_request_is_retry (long /*int*/ request); -public static final boolean webkit_authentication_request_is_retry (long /*int*/ request) { +public static final native boolean _webkit_authentication_request_is_retry (long request); +public static final boolean webkit_authentication_request_is_retry (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -803,8 +803,8 @@ public static final boolean webkit_authentication_request_is_retry (long /*int*/ } /** @method flags=dynamic */ -public static final native void _webkit_credential_free (long /*int*/ credential); -public static final void webkit_credential_free (long /*int*/ credential) { +public static final native void _webkit_credential_free (long credential); +public static final void webkit_credential_free (long credential) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -815,8 +815,8 @@ public static final void webkit_credential_free (long /*int*/ credential) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_allow_tls_certificate_for_host(long /*int*/ webKitWebContext, long /*int*/ GTlsCertificate, byte[] constGCharHost); -public static final long /*int*/ webkit_web_context_allow_tls_certificate_for_host(long /*int*/ webKitWebContext, long /*int*/ GTlsCertificate, byte[] constGCharHost) { +public static final native long _webkit_web_context_allow_tls_certificate_for_host(long webKitWebContext, long GTlsCertificate, byte[] constGCharHost); +public static final long webkit_web_context_allow_tls_certificate_for_host(long webKitWebContext, long GTlsCertificate, byte[] constGCharHost) { assert WEBKIT2 : Webkit2AssertMsg; // since 2.6 lock.lock(); @@ -828,8 +828,8 @@ public static final long /*int*/ webkit_web_context_allow_tls_certificate_for_ho } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_get_type (); -public static final long /*int*/ webkit_web_context_get_type () { +public static final native long _webkit_web_context_get_type (); +public static final long webkit_web_context_get_type () { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -840,8 +840,8 @@ public static final long /*int*/ webkit_web_context_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_credential_new (byte[] username, byte[] password, int persistence); -public static final long /*int*/ webkit_credential_new (byte[] username, byte[] password, int persistence) { +public static final native long _webkit_credential_new (byte[] username, byte[] password, int persistence); +public static final long webkit_credential_new (byte[] username, byte[] password, int persistence) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -853,8 +853,8 @@ public static final long /*int*/ webkit_credential_new (byte[] username, byte[] /** @method flags=dynamic */ -public static final native int _webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData); -public static final int webkit_dom_event_target_add_event_listener (long /*int*/ target, byte[] name, long /*int*/ handler, int bubble, long /*int*/ userData) { +public static final native int _webkit_dom_event_target_add_event_listener (long target, byte[] name, long handler, int bubble, long userData); +public static final int webkit_dom_event_target_add_event_listener (long target, byte[] name, long handler, int bubble, long userData) { lock.lock(); try { return _webkit_dom_event_target_add_event_listener (target, name, handler, bubble, userData); @@ -864,8 +864,8 @@ public static final int webkit_dom_event_target_add_event_listener (long /*int*/ } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_alt_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_alt_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_alt_key (long self); +public static final int webkit_dom_mouse_event_get_alt_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_alt_key (self); @@ -875,8 +875,8 @@ public static final int webkit_dom_mouse_event_get_alt_key (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native short _webkit_dom_mouse_event_get_button (long /*int*/ self); -public static final short webkit_dom_mouse_event_get_button (long /*int*/ self) { +public static final native short _webkit_dom_mouse_event_get_button (long self); +public static final short webkit_dom_mouse_event_get_button (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_button (self); @@ -886,8 +886,8 @@ public static final short webkit_dom_mouse_event_get_button (long /*int*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_ctrl_key (long self); +public static final int webkit_dom_mouse_event_get_ctrl_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_ctrl_key (self); @@ -897,8 +897,8 @@ public static final int webkit_dom_mouse_event_get_ctrl_key (long /*int*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_meta_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_meta_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_meta_key (long self); +public static final int webkit_dom_mouse_event_get_meta_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_meta_key (self); @@ -908,8 +908,8 @@ public static final int webkit_dom_mouse_event_get_meta_key (long /*int*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_mouse_event_get_screen_x (long /*int*/ self); -public static final long webkit_dom_mouse_event_get_screen_x (long /*int*/ self) { +public static final native long _webkit_dom_mouse_event_get_screen_x (long self); +public static final long webkit_dom_mouse_event_get_screen_x (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_screen_x (self); @@ -919,8 +919,8 @@ public static final long webkit_dom_mouse_event_get_screen_x (long /*int*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_mouse_event_get_screen_y (long /*int*/ self); -public static final long webkit_dom_mouse_event_get_screen_y (long /*int*/ self) { +public static final native long _webkit_dom_mouse_event_get_screen_y (long self); +public static final long webkit_dom_mouse_event_get_screen_y (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_screen_y (self); @@ -930,8 +930,8 @@ public static final long webkit_dom_mouse_event_get_screen_y (long /*int*/ self) } /** @method flags=dynamic */ -public static final native int _webkit_dom_mouse_event_get_shift_key (long /*int*/ self); -public static final int webkit_dom_mouse_event_get_shift_key (long /*int*/ self) { +public static final native int _webkit_dom_mouse_event_get_shift_key (long self); +public static final int webkit_dom_mouse_event_get_shift_key (long self) { lock.lock(); try { return _webkit_dom_mouse_event_get_shift_key (self); @@ -941,8 +941,8 @@ public static final int webkit_dom_mouse_event_get_shift_key (long /*int*/ self) } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_char_code (long /*int*/ self); -public static final long webkit_dom_ui_event_get_char_code (long /*int*/ self) { +public static final native long _webkit_dom_ui_event_get_char_code (long self); +public static final long webkit_dom_ui_event_get_char_code (long self) { lock.lock(); try { return _webkit_dom_ui_event_get_char_code (self); @@ -952,8 +952,8 @@ public static final long webkit_dom_ui_event_get_char_code (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_detail (long /*int*/ self); -public static final long webkit_dom_ui_event_get_detail (long /*int*/ self) { +public static final native long _webkit_dom_ui_event_get_detail (long self); +public static final long webkit_dom_ui_event_get_detail (long self) { lock.lock(); try { return _webkit_dom_ui_event_get_detail (self); @@ -963,8 +963,8 @@ public static final long webkit_dom_ui_event_get_detail (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native long _webkit_dom_ui_event_get_key_code (long /*int*/ self); -public static final long webkit_dom_ui_event_get_key_code (long /*int*/ self) { +public static final native long _webkit_dom_ui_event_get_key_code (long self); +public static final long webkit_dom_ui_event_get_key_code (long self) { lock.lock(); try { return _webkit_dom_ui_event_get_key_code (self); @@ -974,8 +974,8 @@ public static final long webkit_dom_ui_event_get_key_code (long /*int*/ self) { } /** @method flags=dynamic */ -public static final native void _webkit_download_cancel (long /*int*/ download); -public static final void webkit_download_cancel (long /*int*/ download) { +public static final native void _webkit_download_cancel (long download); +public static final void webkit_download_cancel (long download) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -986,8 +986,8 @@ public static final void webkit_download_cancel (long /*int*/ download) { } /** @method flags=dynamic */ -public static final native long _webkit_download_get_current_size (long /*int*/ download); -public static final long webkit_download_get_current_size (long /*int*/ download) { +public static final native long _webkit_download_get_current_size (long download); +public static final long webkit_download_get_current_size (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -998,8 +998,8 @@ public static final long webkit_download_get_current_size (long /*int*/ download } /** @method flags=dynamic */ -public static final native long _webkit_download_get_received_data_length (long /*int*/ download); -public static final long webkit_download_get_received_data_length (long /*int*/ download) { +public static final native long _webkit_download_get_received_data_length (long download); +public static final long webkit_download_get_received_data_length (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1010,8 +1010,8 @@ public static final long webkit_download_get_received_data_length (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_network_request (long /*int*/ download); -public static final long /*int*/ webkit_download_get_network_request (long /*int*/ download) { +public static final native long _webkit_download_get_network_request (long download); +public static final long webkit_download_get_network_request (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1022,8 +1022,8 @@ public static final long /*int*/ webkit_download_get_network_request (long /*int } /** @method flags=dynamic */ -public static final native int _webkit_download_get_status (long /*int*/ download); -public static final int webkit_download_get_status (long /*int*/ download) { +public static final native int _webkit_download_get_status (long download); +public static final int webkit_download_get_status (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1034,8 +1034,8 @@ public static final int webkit_download_get_status (long /*int*/ download) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_suggested_filename (long /*int*/ download); -public static final long /*int*/ webkit_download_get_suggested_filename (long /*int*/ download) { +public static final native long _webkit_download_get_suggested_filename (long download); +public static final long webkit_download_get_suggested_filename (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1046,8 +1046,8 @@ public static final long /*int*/ webkit_download_get_suggested_filename (long /* } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_request (long /*int*/ download); -public static final long /*int*/ webkit_download_get_request (long /*int*/ download) { +public static final native long _webkit_download_get_request (long download); +public static final long webkit_download_get_request (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1058,8 +1058,8 @@ public static final long /*int*/ webkit_download_get_request (long /*int*/ downl } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_response (long /*int*/ download); -public static final long /*int*/ webkit_download_get_response (long /*int*/ download) { +public static final native long _webkit_download_get_response (long download); +public static final long webkit_download_get_response (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1070,8 +1070,8 @@ public static final long /*int*/ webkit_download_get_response (long /*int*/ down } /** @method flags=dynamic */ -public static final native long _webkit_download_get_total_size (long /*int*/ download); -public static final long webkit_download_get_total_size (long /*int*/ download) { +public static final native long _webkit_download_get_total_size (long download); +public static final long webkit_download_get_total_size (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1082,8 +1082,8 @@ public static final long webkit_download_get_total_size (long /*int*/ download) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_type (); -public static final long /*int*/ webkit_download_get_type () { +public static final native long _webkit_download_get_type (); +public static final long webkit_download_get_type () { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1094,8 +1094,8 @@ public static final long /*int*/ webkit_download_get_type () { } /** @method flags=dynamic */ -public static final native long _webkit_uri_response_get_content_length (long /*int*/ response); -public static final long webkit_uri_response_get_content_length (long /*int*/ response) { +public static final native long _webkit_uri_response_get_content_length (long response); +public static final long webkit_uri_response_get_content_length (long response) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1106,8 +1106,8 @@ public static final long webkit_uri_response_get_content_length (long /*int*/ re } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_uri (long /*int*/ download); -public static final long /*int*/ webkit_download_get_uri (long /*int*/ download) { +public static final native long _webkit_download_get_uri (long download); +public static final long webkit_download_get_uri (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1118,8 +1118,8 @@ public static final long /*int*/ webkit_download_get_uri (long /*int*/ download) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_get_web_view (long /*int*/ download); -public static final long /*int*/ webkit_download_get_web_view (long /*int*/ download) { +public static final native long _webkit_download_get_web_view (long download); +public static final long webkit_download_get_web_view (long download) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1130,8 +1130,8 @@ public static final long /*int*/ webkit_download_get_web_view (long /*int*/ down } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_download_new (long /*int*/ request); -public static final long /*int*/ webkit_download_new (long /*int*/ request) { +public static final native long _webkit_download_new (long request); +public static final long webkit_download_new (long request) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1142,8 +1142,8 @@ public static final long /*int*/ webkit_download_new (long /*int*/ request) { } /** @method flags=dynamic */ -public static final native void _webkit_download_set_allow_overwrite (long /*int*/ download, boolean allowed); -public static final void webkit_download_set_allow_overwrite (long /*int*/ download, boolean allowed) { +public static final native void _webkit_download_set_allow_overwrite (long download, boolean allowed); +public static final void webkit_download_set_allow_overwrite (long download, boolean allowed) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1154,8 +1154,8 @@ public static final void webkit_download_set_allow_overwrite (long /*int*/ downl } /** @method flags=dynamic */ -public static final native void _webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri); -public static final void webkit_download_set_destination_uri (long /*int*/ download, byte[] destination_uri) { +public static final native void _webkit_download_set_destination_uri (long download, byte[] destination_uri); +public static final void webkit_download_set_destination_uri (long download, byte[] destination_uri) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1166,8 +1166,8 @@ public static final void webkit_download_set_destination_uri (long /*int*/ downl } /** @method flags=dynamic */ -public static final native void _webkit_download_set_destination (long /*int*/ download, byte[] destination_uri); -public static final void webkit_download_set_destination (long /*int*/ download, byte[] destination_uri) { +public static final native void _webkit_download_set_destination (long download, byte[] destination_uri); +public static final void webkit_download_set_destination (long download, byte[] destination_uri) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1178,8 +1178,8 @@ public static final void webkit_download_set_destination (long /*int*/ download, } /** @method flags=dynamic */ -public static final native void _webkit_download_start (long /*int*/ download); -public static final void webkit_download_start (long /*int*/ download) { +public static final native void _webkit_download_start (long download); +public static final void webkit_download_start (long download) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1190,8 +1190,8 @@ public static final void webkit_download_start (long /*int*/ download) { } /** @method flags=dynamic */ -public static final native void _webkit_favicon_database_set_path (long /*int*/ database, long /*int*/ path); -public static final void webkit_favicon_database_set_path (long /*int*/ database, long /*int*/ path) { +public static final native void _webkit_favicon_database_set_path (long database, long path); +public static final void webkit_favicon_database_set_path (long database, long path) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1202,8 +1202,8 @@ public static final void webkit_favicon_database_set_path (long /*int*/ database } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_get_default_session (); -public static final long /*int*/ webkit_get_default_session () { +public static final native long _webkit_get_default_session (); +public static final long webkit_get_default_session () { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1214,8 +1214,8 @@ public static final long /*int*/ webkit_get_default_session () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_get_favicon_database (); -public static final long /*int*/ webkit_get_favicon_database () { +public static final native long _webkit_get_favicon_database (); +public static final long webkit_get_favicon_database () { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1226,8 +1226,8 @@ public static final long /*int*/ webkit_get_favicon_database () { } /** @method flags=dynamic */ -public static final native boolean _webkit_hit_test_result_context_is_link (long /*int*/ hit_test_result); -public static final boolean webkit_hit_test_result_context_is_link (long /*int*/ hit_test_result) { +public static final native boolean _webkit_hit_test_result_context_is_link (long hit_test_result); +public static final boolean webkit_hit_test_result_context_is_link (long hit_test_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1238,8 +1238,8 @@ public static final boolean webkit_hit_test_result_context_is_link (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result); -public static final long /*int*/ webkit_hit_test_result_get_link_uri (long /*int*/ hit_test_result) { +public static final native long _webkit_hit_test_result_get_link_uri (long hit_test_result); +public static final long webkit_hit_test_result_get_link_uri (long hit_test_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1250,8 +1250,8 @@ public static final long /*int*/ webkit_hit_test_result_get_link_uri (long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result); -public static final long /*int*/ webkit_hit_test_result_get_link_title (long /*int*/ hit_test_result) { +public static final native long _webkit_hit_test_result_get_link_title (long hit_test_result); +public static final long webkit_hit_test_result_get_link_title (long hit_test_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1334,8 +1334,8 @@ public static final int webkit_get_minor_version () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_navigation_policy_decision_get_request (long /*int*/ decision); -public static final long /*int*/ webkit_navigation_policy_decision_get_request (long /*int*/ decision) { +public static final native long _webkit_navigation_policy_decision_get_request (long decision); +public static final long webkit_navigation_policy_decision_get_request (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1346,8 +1346,8 @@ public static final long /*int*/ webkit_navigation_policy_decision_get_request ( } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_network_request_get_message (long /*int*/ request); -public static final long /*int*/ webkit_network_request_get_message (long /*int*/ request) { +public static final native long _webkit_network_request_get_message (long request); +public static final long webkit_network_request_get_message (long request) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1358,8 +1358,8 @@ public static final long /*int*/ webkit_network_request_get_message (long /*int* } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_network_request_get_uri (long /*int*/ request); -public static final long /*int*/ webkit_network_request_get_uri (long /*int*/ request) { +public static final native long _webkit_network_request_get_uri (long request); +public static final long webkit_network_request_get_uri (long request) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1370,8 +1370,8 @@ public static final long /*int*/ webkit_network_request_get_uri (long /*int*/ re } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_network_request_new (byte[] uri); -public static final long /*int*/ webkit_network_request_new (byte[] uri) { +public static final native long _webkit_network_request_new (byte[] uri); +public static final long webkit_network_request_new (byte[] uri) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1382,8 +1382,8 @@ public static final long /*int*/ webkit_network_request_new (byte[] uri) { } /** @method flags=dynamic */ -public static final native void _webkit_policy_decision_download (long /*int*/ decision); -public static final void webkit_policy_decision_download (long /*int*/ decision) { +public static final native void _webkit_policy_decision_download (long decision); +public static final void webkit_policy_decision_download (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1394,8 +1394,8 @@ public static final void webkit_policy_decision_download (long /*int*/ decision) } /** @method flags=dynamic */ -public static final native void _webkit_policy_decision_ignore (long /*int*/ decision); -public static final void webkit_policy_decision_ignore (long /*int*/ decision) { +public static final native void _webkit_policy_decision_ignore (long decision); +public static final void webkit_policy_decision_ignore (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1406,8 +1406,8 @@ public static final void webkit_policy_decision_ignore (long /*int*/ decision) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_soup_auth_dialog_get_type (); -public static final long /*int*/ webkit_soup_auth_dialog_get_type () { +public static final native long _webkit_soup_auth_dialog_get_type (); +public static final long webkit_soup_auth_dialog_get_type () { // Can't find reference for this. Currently used only by webkit1 thou, probably webkit1-only. assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); @@ -1419,8 +1419,8 @@ public static final long /*int*/ webkit_soup_auth_dialog_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_get_default (); -public static final long /*int*/ webkit_web_context_get_default () { +public static final native long _webkit_web_context_get_default (); +public static final long webkit_web_context_get_default () { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1431,8 +1431,8 @@ public static final long /*int*/ webkit_web_context_get_default () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_context_get_website_data_manager (long /*int*/ context); -public static final long /*int*/ webkit_web_context_get_website_data_manager (long /*int*/ context) { +public static final native long _webkit_web_context_get_website_data_manager (long context); +public static final long webkit_web_context_get_website_data_manager (long context) { assert WEBKIT2 : Webkit2AssertMsg; // Since 2.10 lock.lock(); try { @@ -1443,8 +1443,8 @@ try { } /** @method flags=dynamic */ -public static final native void _webkit_web_context_set_tls_errors_policy(long /*int*/ context, int policy); -public static final void webkit_web_context_set_tls_errors_policy (long /*int*/ context, int policy) { +public static final native void _webkit_web_context_set_tls_errors_policy(long context, int policy); +public static final void webkit_web_context_set_tls_errors_policy (long context, int policy) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1456,8 +1456,8 @@ public static final void webkit_web_context_set_tls_errors_policy (long /*int*/ /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_data_source_get_data (long /*int*/ data_source); -public static final long /*int*/ webkit_web_data_source_get_data (long /*int*/ data_source) { +public static final native long _webkit_web_data_source_get_data (long data_source); +public static final long webkit_web_data_source_get_data (long data_source) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1468,8 +1468,8 @@ public static final long /*int*/ webkit_web_data_source_get_data (long /*int*/ d } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_data_source_get_encoding (long /*int*/ data_source); -public static final long /*int*/ webkit_web_data_source_get_encoding (long /*int*/ data_source) { +public static final native long _webkit_web_data_source_get_encoding (long data_source); +public static final long webkit_web_data_source_get_encoding (long data_source) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1480,8 +1480,8 @@ public static final long /*int*/ webkit_web_data_source_get_encoding (long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_data_source (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_data_source (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_data_source (long frame); +public static final long webkit_web_frame_get_data_source (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1492,8 +1492,8 @@ public static final long /*int*/ webkit_web_frame_get_data_source (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_global_context (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_global_context (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_global_context (long frame); +public static final long webkit_web_frame_get_global_context (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1504,8 +1504,8 @@ public static final long /*int*/ webkit_web_frame_get_global_context (long /*int } /** @method flags=dynamic */ -public static final native int _webkit_web_frame_get_load_status (long /*int*/ frame); -public static final int webkit_web_frame_get_load_status (long /*int*/ frame) { +public static final native int _webkit_web_frame_get_load_status (long frame); +public static final int webkit_web_frame_get_load_status (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1516,8 +1516,8 @@ public static final int webkit_web_frame_get_load_status (long /*int*/ frame) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_parent (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_parent (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_parent (long frame); +public static final long webkit_web_frame_get_parent (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1528,8 +1528,8 @@ public static final long /*int*/ webkit_web_frame_get_parent (long /*int*/ frame } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_title (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_title (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_title (long frame); +public static final long webkit_web_frame_get_title (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1540,8 +1540,8 @@ public static final long /*int*/ webkit_web_frame_get_title (long /*int*/ frame) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_type (); -public static final long /*int*/ webkit_web_frame_get_type () { +public static final native long _webkit_web_frame_get_type (); +public static final long webkit_web_frame_get_type () { // Can't find reference. Probably a webkit1 macro. assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); @@ -1553,8 +1553,8 @@ public static final long /*int*/ webkit_web_frame_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_uri (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_uri (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_uri (long frame); +public static final long webkit_web_frame_get_uri (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1565,8 +1565,8 @@ public static final long /*int*/ webkit_web_frame_get_uri (long /*int*/ frame) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_frame_get_web_view (long /*int*/ frame); -public static final long /*int*/ webkit_web_frame_get_web_view (long /*int*/ frame) { +public static final native long _webkit_web_frame_get_web_view (long frame); +public static final long webkit_web_frame_get_web_view (long frame) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1577,8 +1577,8 @@ public static final long /*int*/ webkit_web_frame_get_web_view (long /*int*/ fra } /** @method flags=dynamic */ -public static final native void _webkit_web_policy_decision_download (long /*int*/ decision); -public static final void webkit_web_policy_decision_download (long /*int*/ decision) { +public static final native void _webkit_web_policy_decision_download (long decision); +public static final void webkit_web_policy_decision_download (long decision) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1589,8 +1589,8 @@ public static final void webkit_web_policy_decision_download (long /*int*/ decis } /** @method flags=dynamic */ -public static final native void _webkit_web_policy_decision_ignore (long /*int*/ decision); -public static final void webkit_web_policy_decision_ignore (long /*int*/ decision) { +public static final native void _webkit_web_policy_decision_ignore (long decision); +public static final void webkit_web_policy_decision_ignore (long decision) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1601,8 +1601,8 @@ public static final void webkit_web_policy_decision_ignore (long /*int*/ decisio } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_go_back (long /*int*/ web_view); -public static final int webkit_web_view_can_go_back (long /*int*/ web_view) { +public static final native int _webkit_web_view_can_go_back (long web_view); +public static final int webkit_web_view_can_go_back (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1613,8 +1613,8 @@ public static final int webkit_web_view_can_go_back (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_main_resource (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_main_resource (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_main_resource (long web_view); +public static final long webkit_web_view_get_main_resource (long web_view) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1625,8 +1625,8 @@ public static final long /*int*/ webkit_web_view_get_main_resource (long /*int*/ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_context (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_context (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_context (long web_view); +public static final long webkit_web_view_get_context (long web_view) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1637,8 +1637,8 @@ public static final long /*int*/ webkit_web_view_get_context (long /*int*/ web_v } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_go_forward (long /*int*/ web_view); -public static final int webkit_web_view_can_go_forward (long /*int*/ web_view) { +public static final native int _webkit_web_view_can_go_forward (long web_view); +public static final int webkit_web_view_can_go_forward (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1649,8 +1649,8 @@ public static final int webkit_web_view_can_go_forward (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native int _webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type); -public static final int webkit_web_view_can_show_mime_type (long /*int*/ web_view, long /*int*/ mime_type) { +public static final native int _webkit_web_view_can_show_mime_type (long web_view, long mime_type); +public static final int webkit_web_view_can_show_mime_type (long web_view, long mime_type) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1661,8 +1661,8 @@ public static final int webkit_web_view_can_show_mime_type (long /*int*/ web_vie } /** @method flags=dynamic */ -public static final native void _webkit_web_view_execute_script (long /*int*/ web_view, byte[] script); -public static final void webkit_web_view_execute_script (long /*int*/ web_view, byte[] script) { // never called +public static final native void _webkit_web_view_execute_script (long web_view, byte[] script); +public static final void webkit_web_view_execute_script (long web_view, byte[] script) { // never called assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1673,8 +1673,8 @@ public static final void webkit_web_view_execute_script (long /*int*/ web_view, } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_dom_document (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_dom_document (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_dom_document (long web_view); +public static final long webkit_web_view_get_dom_document (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; //TODO - guard from being called on webkit2 (webkit_web_view_get_dom_document) lock.lock(); @@ -1686,8 +1686,8 @@ public static final long /*int*/ webkit_web_view_get_dom_document (long /*int*/ } /** @method flags=dynamic */ -public static final native double /*int*/ _webkit_web_view_get_estimated_load_progress (long /*int*/ web_view); -public static final double /*int*/ webkit_web_view_get_estimated_load_progress (long /*int*/ web_view) { +public static final native double _webkit_web_view_get_estimated_load_progress (long web_view); +public static final double webkit_web_view_get_estimated_load_progress (long web_view) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1698,8 +1698,8 @@ public static final double /*int*/ webkit_web_view_get_estimated_load_progress ( } /** @method flags=dynamic */ -public static final native int _webkit_web_view_get_load_status (long /*int*/ web_view); -public static final int webkit_web_view_get_load_status (long /*int*/ web_view) { +public static final native int _webkit_web_view_get_load_status (long web_view); +public static final int webkit_web_view_get_load_status (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1710,8 +1710,8 @@ public static final int webkit_web_view_get_load_status (long /*int*/ web_view) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_main_frame (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_main_frame (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_main_frame (long web_view); +public static final long webkit_web_view_get_main_frame (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1722,8 +1722,8 @@ public static final long /*int*/ webkit_web_view_get_main_frame (long /*int*/ we } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_page_id (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_page_id (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_page_id (long web_view); +public static final long webkit_web_view_get_page_id (long web_view) { lock.lock(); try { return _webkit_web_view_get_page_id (web_view); @@ -1733,8 +1733,8 @@ public static final long /*int*/ webkit_web_view_get_page_id (long /*int*/ web_v } /** @method flags=dynamic */ -public static final native double _webkit_web_view_get_progress (long /*int*/ web_view); -public static final double webkit_web_view_get_progress (long /*int*/ web_view) { +public static final native double _webkit_web_view_get_progress (long web_view); +public static final double webkit_web_view_get_progress (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1745,8 +1745,8 @@ public static final double webkit_web_view_get_progress (long /*int*/ web_view) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_settings (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_settings (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_settings (long web_view); +public static final long webkit_web_view_get_settings (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1757,8 +1757,8 @@ public static final long /*int*/ webkit_web_view_get_settings (long /*int*/ web_ } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_title (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_title (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_title (long web_view); +public static final long webkit_web_view_get_title (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1769,8 +1769,8 @@ public static final long /*int*/ webkit_web_view_get_title (long /*int*/ web_vie } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_type (); -public static final long /*int*/ webkit_web_view_get_type () { +public static final native long _webkit_web_view_get_type (); +public static final long webkit_web_view_get_type () { // TODO Bug 514859 Investigate if this is a webkit1 only function or if it can be used on webkit2 also. // can't find reference for it. Could be a macro. lock.lock(); @@ -1782,8 +1782,8 @@ public static final long /*int*/ webkit_web_view_get_type () { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_uri (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_uri (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_uri (long web_view); +public static final long webkit_web_view_get_uri (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1794,8 +1794,8 @@ public static final long /*int*/ webkit_web_view_get_uri (long /*int*/ web_view) } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_window_features (long /*int*/ web_view); -public static final long /*int*/ webkit_web_view_get_window_features (long /*int*/ web_view) { +public static final native long _webkit_web_view_get_window_features (long web_view); +public static final long webkit_web_view_get_window_features (long web_view) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1806,9 +1806,9 @@ public static final long /*int*/ webkit_web_view_get_window_features (long /*int } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_get_window_properties (long /*int*/ webView); +public static final native long _webkit_web_view_get_window_properties (long webView); /** WebKitWindowProperties * webkit_web_view_get_window_properties (WebKitWebView *web_view); */ -public static final long /*int*/ webkit_web_view_get_window_properties (long /*int*/ webView) { +public static final long webkit_web_view_get_window_properties (long webView) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1822,8 +1822,8 @@ public static final long /*int*/ webkit_web_view_get_window_properties (long /*i * @method flags=dynamic * @param rectangle cast=(GdkRectangle *),flags=no_in */ -public static final native void _webkit_window_properties_get_geometry (long /*int*/ webKitWindowProperties, GdkRectangle rectangle); -public static final void webkit_window_properties_get_geometry (long /*int*/ webKitWindowProperties, GdkRectangle rectangle ) { +public static final native void _webkit_window_properties_get_geometry (long webKitWindowProperties, GdkRectangle rectangle); +public static final void webkit_window_properties_get_geometry (long webKitWindowProperties, GdkRectangle rectangle ) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1836,8 +1836,8 @@ public static final void webkit_window_properties_get_geometry (long /*int*/ web /** @method flags=dynamic */ -public static final native void _webkit_web_view_go_back (long /*int*/ web_view); -public static final void webkit_web_view_go_back (long /*int*/ web_view) { +public static final native void _webkit_web_view_go_back (long web_view); +public static final void webkit_web_view_go_back (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1848,8 +1848,8 @@ public static final void webkit_web_view_go_back (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_go_forward (long /*int*/ web_view); -public static final void webkit_web_view_go_forward (long /*int*/ web_view) { +public static final native void _webkit_web_view_go_forward (long web_view); +public static final void webkit_web_view_go_forward (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1860,8 +1860,8 @@ public static final void webkit_web_view_go_forward (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_html (long /*int*/ web_view, byte[] content, byte[] base_uri); -public static final void webkit_web_view_load_html (long /*int*/ web_view, byte[] content, byte[] base_uri) { +public static final native void _webkit_web_view_load_html (long web_view, byte[] content, byte[] base_uri); +public static final void webkit_web_view_load_html (long web_view, byte[] content, byte[] base_uri) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1872,8 +1872,8 @@ public static final void webkit_web_view_load_html (long /*int*/ web_view, byte[ } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_bytes (long /*int*/ web_view, long /*int*/ bytes, byte [] mime_type, byte [] encoding, byte [] base_uri); -public static final void webkit_web_view_load_bytes (long /*int*/ web_view, long /*int*/ bytes, byte [] mime_type, byte [] encoding, byte [] base_uri) { +public static final native void _webkit_web_view_load_bytes (long web_view, long bytes, byte [] mime_type, byte [] encoding, byte [] base_uri); +public static final void webkit_web_view_load_bytes (long web_view, long bytes, byte [] mime_type, byte [] encoding, byte [] base_uri) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1884,8 +1884,8 @@ public static final void webkit_web_view_load_bytes (long /*int*/ web_view, long } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri); -public static final void webkit_web_view_load_string (long /*int*/ web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) { +public static final native void _webkit_web_view_load_string (long web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri); +public static final void webkit_web_view_load_string (long web_view, byte[] content, byte[] mime_type, byte[] encoding, byte[] base_uri) { assert WEBKIT1 : Webkit1AssertMsg; lock.lock(); try { @@ -1896,8 +1896,8 @@ public static final void webkit_web_view_load_string (long /*int*/ web_view, byt } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_request (long /*int*/ web_view, long /*int*/ request); -public static final void webkit_web_view_load_request (long /*int*/ web_view, long /*int*/ request) { +public static final native void _webkit_web_view_load_request (long web_view, long request); +public static final void webkit_web_view_load_request (long web_view, long request) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1908,8 +1908,8 @@ public static final void webkit_web_view_load_request (long /*int*/ web_view, lo } /** @method flags=dynamic */ -public static final native void _webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri); -public static final void webkit_web_view_load_uri (long /*int*/ web_view, byte[] uri) { +public static final native void _webkit_web_view_load_uri (long web_view, byte[] uri); +public static final void webkit_web_view_load_uri (long web_view, byte[] uri) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1920,8 +1920,8 @@ public static final void webkit_web_view_load_uri (long /*int*/ web_view, byte[] } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_view_new (); -public static final long /*int*/ webkit_web_view_new () { +public static final native long _webkit_web_view_new (); +public static final long webkit_web_view_new () { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -1933,8 +1933,8 @@ public static final long /*int*/ webkit_web_view_new () { /** @method flags=dynamic */ // @param context cast=(WebKitWebContext*) @param directory cast=(const gchar *) -public static final native void _webkit_web_context_set_web_extensions_directory (long /*int*/ context, byte[] directory); -public static final void webkit_web_context_set_web_extensions_directory (long /*int*/ context, byte[] directory) { +public static final native void _webkit_web_context_set_web_extensions_directory (long context, byte[] directory); +public static final void webkit_web_context_set_web_extensions_directory (long context, byte[] directory) { assert WEBKIT2; lock.lock(); try { @@ -1962,9 +1962,9 @@ public static final void webkit_web_context_set_web_extensions_initialization_us * @method flags=dynamic * @param js_result cast=(gpointer) */ -public static final native long /*int*/ _webkit_javascript_result_get_global_context(long /*int*/ js_result); +public static final native long _webkit_javascript_result_get_global_context(long js_result); /** JSGlobalContextRef webkit_javascript_result_get_global_context (WebKitJavascriptResult *js_result); */ -public static final long /*int*/ webkit_javascript_result_get_global_context(long /*int*/ js_result) { +public static final long webkit_javascript_result_get_global_context(long js_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1978,9 +1978,9 @@ public static final long /*int*/ webkit_javascript_result_get_global_context(lon * @method flags=dynamic * @param js_result cast=(gpointer) */ -public static final native long /*int*/ _webkit_javascript_result_get_value(long /*int*/ js_result); +public static final native long _webkit_javascript_result_get_value(long js_result); /** JSValueRef webkit_javascript_result_get_value (WebKitJavascriptResult *js_result); */ -public static final long /*int*/ webkit_javascript_result_get_value(long /*int*/ js_result) { +public static final long webkit_javascript_result_get_value(long js_result) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -1991,8 +1991,8 @@ public static final long /*int*/ webkit_javascript_result_get_value(long /*int*/ } /** @method flags=dynamic */ -public static final native void _webkit_web_view_reload (long /*int*/ web_view); -public static final void webkit_web_view_reload (long /*int*/ web_view) { +public static final native void _webkit_web_view_reload (long web_view); +public static final void webkit_web_view_reload (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -2004,9 +2004,9 @@ public static final void webkit_web_view_reload (long /*int*/ web_view) { /** @method flags=dynamic */ -public static final native void _webkit_web_view_run_javascript (long /*int*/ web_view, byte [] script, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data); +public static final native void _webkit_web_view_run_javascript (long web_view, byte [] script, long cancellable, long callback, long user_data); /** void webkit_web_view_run_javascript (WebKitWebView *web_view, const gchar *script, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); **/ -public static final void webkit_web_view_run_javascript (long /*int*/ web_view, byte[] script, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data) { +public static final void webkit_web_view_run_javascript (long web_view, byte[] script, long cancellable, long callback, long user_data) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2017,8 +2017,8 @@ public static final void webkit_web_view_run_javascript (long /*int*/ web_view, } /** @method flags=dynamic */ -public static final native void _webkit_web_resource_get_data (long /*int*/ webKitWebResource, long /*int*/ gCancellable, long /*int*/ GAsyncReadyCallback, long /*int*/ user_data); -public static final void webkit_web_resource_get_data (long /*int*/ webKitWebResource, long /*int*/ gCancellable, long /*int*/ GAsyncReadyCallback, long /*int*/ user_data) { +public static final native void _webkit_web_resource_get_data (long webKitWebResource, long gCancellable, long GAsyncReadyCallback, long user_data); +public static final void webkit_web_resource_get_data (long webKitWebResource, long gCancellable, long GAsyncReadyCallback, long user_data) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -2029,8 +2029,8 @@ public static final void webkit_web_resource_get_data (long /*int*/ webKitWebRes } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_web_resource_get_data_finish(long /*int*/ WebKitWebResource, long /*int*/ GAsyncResult, long /*int*/[] gsize, long /*int*/ GError[]); -public static final long /*int*/ webkit_web_resource_get_data_finish(long /*int*/ WebKitWebResource, long /*int*/ GAsyncResult, long /*int*/[] gsize, long /*int*/ GError[]) { +public static final native long _webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long /*int*/[] gsize, long GError[]); +public static final long webkit_web_resource_get_data_finish(long WebKitWebResource, long GAsyncResult, long /*int*/[] gsize, long GError[]) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2045,9 +2045,9 @@ public static final long /*int*/ webkit_web_resource_get_data_finish(long /*int* * @method flags=dynamic * @param gerror cast=(GError **) */ -public static final native long /*int*/ _webkit_web_view_run_javascript_finish(long /*int*/ web_view, long /*int*/ GAsyncResult, long /*int*/[] gerror); +public static final native long _webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long /*int*/[] gerror); /**WebKitJavascriptResult * webkit_web_view_run_javascript_finish (WebKitWebView *web_view, GAsyncResult *result, GError **error);*/ -public static long /*int*/ webkit_web_view_run_javascript_finish(long /*int*/ web_view, long /*int*/ GAsyncResult, long /*int*/[] gerror) { +public static long webkit_web_view_run_javascript_finish(long web_view, long GAsyncResult, long /*int*/[] gerror) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2058,8 +2058,8 @@ public static long /*int*/ webkit_web_view_run_javascript_finish(long /*int*/ we } /** @method flags=dynamic */ -public static final native void _webkit_web_view_stop_loading (long /*int*/ web_view); -public static final void webkit_web_view_stop_loading (long /*int*/ web_view) { +public static final native void _webkit_web_view_stop_loading (long web_view); +public static final void webkit_web_view_stop_loading (long web_view) { assert WEBKIT1 || WEBKIT2; lock.lock(); try { @@ -2070,8 +2070,8 @@ public static final void webkit_web_view_stop_loading (long /*int*/ web_view) { } /** @method flags=dynamic */ -public static final native void _webkit_website_data_manager_clear (long /*int*/ manager, long /*int*/ types, long /*int*/ timespan, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data); -public static final void webkit_website_data_manager_clear (long /*int*/ manager, long /*int*/ types, long /*int*/ timespan, long /*int*/ cancellable, long /*int*/ callback, long /*int*/ user_data) { +public static final native void _webkit_website_data_manager_clear (long manager, long types, long timespan, long cancellable, long callback, long user_data); +public static final void webkit_website_data_manager_clear (long manager, long types, long timespan, long cancellable, long callback, long user_data) { assert WEBKIT2 : Webkit2AssertMsg; // Since 2.16 lock.lock(); try { @@ -2082,8 +2082,8 @@ public static final void webkit_website_data_manager_clear (long /*int*/ manager } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_response_policy_decision_get_request (long /*int*/ decision); -public static final long /*int*/ webkit_response_policy_decision_get_request (long /*int*/ decision) { // never called +public static final native long _webkit_response_policy_decision_get_request (long decision); +public static final long webkit_response_policy_decision_get_request (long decision) { // never called assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2094,8 +2094,8 @@ public static final long /*int*/ webkit_response_policy_decision_get_request (l } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_response_policy_decision_get_response (long /*int*/ decision); -public static final long /*int*/ webkit_response_policy_decision_get_response (long /*int*/ decision) { +public static final native long _webkit_response_policy_decision_get_response (long decision); +public static final long webkit_response_policy_decision_get_response (long decision) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2106,8 +2106,8 @@ public static final long /*int*/ webkit_response_policy_decision_get_response ( } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_request_new (byte[] uri); -public static final long /*int*/ webkit_uri_request_new (byte[] uri) { +public static final native long _webkit_uri_request_new (byte[] uri); +public static final long webkit_uri_request_new (byte[] uri) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2118,8 +2118,8 @@ public static final long /*int*/ webkit_uri_request_new (byte[] uri) { } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_request_get_http_headers (long /*int*/ request); -public static final long /*int*/ webkit_uri_request_get_http_headers (long /*int*/ request) { +public static final native long _webkit_uri_request_get_http_headers (long request); +public static final long webkit_uri_request_get_http_headers (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2130,8 +2130,8 @@ public static final long /*int*/ webkit_uri_request_get_http_headers (long /*in } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_request_get_uri (long /*int*/ request); -public static final long /*int*/ webkit_uri_request_get_uri (long /*int*/ request) { +public static final native long _webkit_uri_request_get_uri (long request); +public static final long webkit_uri_request_get_uri (long request) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2142,8 +2142,8 @@ public static final long /*int*/ webkit_uri_request_get_uri (long /*int*/ reque } /** @method flags=dynamic */ -public static final native long /*int*/ _webkit_uri_response_get_mime_type (long /*int*/ responce); -public static final long /*int*/ webkit_uri_response_get_mime_type (long /*int*/ response) { +public static final native long _webkit_uri_response_get_mime_type (long responce); +public static final long webkit_uri_response_get_mime_type (long response) { assert WEBKIT2 : Webkit2AssertMsg; lock.lock(); try { @@ -2163,14 +2163,14 @@ public static final native int GdkRectangle_sizeof(); * @param src cast=(const void *),flags=no_out * @param size cast=(size_t) */ -public static final native void memmove (long /*int*/ dest, JSClassDefinition src, long /*int*/ size); +public static final native void memmove (long dest, JSClassDefinition src, long size); /** * @method flags=getter * @param cookie cast=(SoupCookie *) */ -public static final native long /*int*/ _SoupCookie_expires (long /*int*/ cookie); -public static final long /*int*/ SoupCookie_expires (long /*int*/ cookie) { +public static final native long _SoupCookie_expires (long cookie); +public static final long SoupCookie_expires (long cookie) { lock.lock(); try { return _SoupCookie_expires (cookie); @@ -2184,8 +2184,8 @@ public static final long /*int*/ SoupCookie_expires (long /*int*/ cookie) { * @param message cast=(SoupMessage *) * @param method cast=(const char *) */ -public static final native void _SoupMessage_method (long /*int*/ message, long /*int*/ method); -public static final void SoupMessage_method (long /*int*/ message, long /*int*/ method) { +public static final native void _SoupMessage_method (long message, long method); +public static final void SoupMessage_method (long message, long method) { lock.lock(); try { _SoupMessage_method (message, method); @@ -2198,8 +2198,8 @@ public static final void SoupMessage_method (long /*int*/ message, long /*int*/ * @method flags=getter * @param message cast=(SoupMessage *) */ -public static final native long /*int*/ _SoupMessage_request_body (long /*int*/ message); -public static final long /*int*/ SoupMessage_request_body (long /*int*/ message) { +public static final native long _SoupMessage_request_body (long message); +public static final long SoupMessage_request_body (long message) { lock.lock(); try { return _SoupMessage_request_body (message); @@ -2212,8 +2212,8 @@ public static final long /*int*/ SoupMessage_request_body (long /*int*/ message) * @method flags=getter * @param message cast=(SoupMessage *) */ -public static final native long /*int*/ _SoupMessage_request_headers (long /*int*/ message); -public static final long /*int*/ SoupMessage_request_headers (long /*int*/ message) { +public static final native long _SoupMessage_request_headers (long message); +public static final long SoupMessage_request_headers (long message) { lock.lock(); try { return _SoupMessage_request_headers (message); |