From be73abf6be7d500ac17b1247ebee741e3a177b7d Mon Sep 17 00:00:00 2001 From: Grant Gayed Date: Tue, 27 Sep 2011 12:57:35 -0400 Subject: Bug 345682 WebKit for GTK not detected --- .../Eclipse SWT WebKit/gtk/library/webkitgtk.c | 778 ++++++++++++++++++++- .../Eclipse SWT WebKit/gtk/library/webkitgtk.h | 15 + .../gtk/library/webkitgtk_stats.c | 6 +- .../gtk/library/webkitgtk_stats.h | 6 +- .../gtk/org/eclipse/swt/browser/WebKit.java | 16 +- .../org/eclipse/swt/internal/webkit/WebKitGTK.java | 263 +++++-- .../win32/library/webkit_win32.h | 2 + .../win32/library/webkit_win32_custom.cpp | 2 +- 8 files changed, 966 insertions(+), 122 deletions(-) (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit') 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 3ce68d9355..ccee8100b4 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, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 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 @@ -37,7 +37,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSClassCreate) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSClassCreate_FUNC); +/* rc = (jintLong)JSClassCreate((const JSClassDefinition*)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSClassCreate) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const JSClassDefinition*))fp)((const JSClassDefinition*)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSClassCreate_FUNC); return rc; } @@ -49,7 +57,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSContextGetGlobalObject) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSContextGetGlobalObject_FUNC); +/* rc = (jintLong)JSContextGetGlobalObject((JSContextRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSContextGetGlobalObject) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef))fp)((JSContextRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSContextGetGlobalObject_FUNC); return rc; } @@ -63,7 +79,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSEvaluateScript) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSEvaluateScript_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSEvaluateScript((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSEvaluateScript) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef, JSObjectRef, JSStringRef, jint, JSValueRef *))fp)((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectRef)arg2, (JSStringRef)arg3, arg4, (JSValueRef *)lparg5); + } + } fail: if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSEvaluateScript_FUNC); @@ -77,7 +101,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPrivate) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPrivate_FUNC); +/* rc = (jintLong)JSObjectGetPrivate((JSObjectRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPrivate) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSObjectRef))fp)((JSObjectRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPrivate_FUNC); return rc; } @@ -91,7 +123,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetProperty) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetProperty_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSObjectGetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetProperty) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, JSStringRef, JSValueRef*))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef*)lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetProperty_FUNC); @@ -107,7 +147,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectGetPropertyAtIndex) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectGetPropertyAtIndex_FUNC); if (arg3) if ((lparg3 = (*env)->GetIntLongArrayElements(env, arg3, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSObjectGetPropertyAtIndex((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectGetPropertyAtIndex) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, unsigned, JSValueRef*))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (unsigned)arg2, (JSValueRef*)lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectGetPropertyAtIndex_FUNC); @@ -121,7 +169,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMake) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMake_FUNC); +/* rc = (jintLong)JSObjectMake((JSContextRef)arg0, (JSClassRef)arg1, (void *)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMake) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSClassRef, void *))fp)((JSContextRef)arg0, (JSClassRef)arg1, (void *)arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMake_FUNC); return rc; } @@ -137,7 +193,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeArray) 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((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeArray) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, size_t, const struct OpaqueJSValue * const*, JSValueRef*))fp)((JSContextRef)arg0, (size_t)arg1, (const struct OpaqueJSValue * const*)lparg2, (JSValueRef*)lparg3); + } + } fail: if (arg3 && lparg3) (*env)->ReleaseIntLongArrayElements(env, arg3, lparg3, 0); if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); @@ -152,7 +216,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSObjectMakeFunctionWithCallback) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); +/* rc = (jintLong)JSObjectMakeFunctionWithCallback((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectCallAsFunctionCallback)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectMakeFunctionWithCallback) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef, JSObjectCallAsFunctionCallback))fp)((JSContextRef)arg0, (JSStringRef)arg1, (JSObjectCallAsFunctionCallback)arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectMakeFunctionWithCallback_FUNC); return rc; } @@ -165,7 +237,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSObjectSetProperty) jintLong *lparg5=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1JSObjectSetProperty_FUNC); if (arg5) if ((lparg5 = (*env)->GetIntLongArrayElements(env, arg5, NULL)) == NULL) goto fail; +/* JSObjectSetProperty((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSObjectSetProperty) + if (fp) { + ((void (CALLING_CONVENTION*)(JSContextRef, JSObjectRef, JSStringRef, JSValueRef, JSPropertyAttributes, JSValueRef *))fp)((JSContextRef)arg0, (JSObjectRef)arg1, (JSStringRef)arg2, (JSValueRef)arg3, (JSPropertyAttributes)arg4, (JSValueRef *)lparg5); + } + } fail: if (arg5 && lparg5) (*env)->ReleaseIntLongArrayElements(env, arg5, lparg5, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSObjectSetProperty_FUNC); @@ -180,7 +260,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringCreateWithUTF8CString) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringCreateWithUTF8CString_FUNC); if (arg0) if ((lparg0 = (*env)->GetByteArrayElements(env, arg0, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSStringCreateWithUTF8CString((const char *)lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringCreateWithUTF8CString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *))fp)((const char *)lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringCreateWithUTF8CString_FUNC); @@ -194,7 +282,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetLength) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetLength_FUNC); +/* rc = (jintLong)JSStringGetLength((JSStringRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetLength) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetLength_FUNC); return rc; } @@ -206,7 +302,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetMaximumUTF8CStringSize) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); +/* rc = (jintLong)JSStringGetMaximumUTF8CStringSize((JSStringRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetMaximumUTF8CStringSize) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetMaximumUTF8CStringSize_FUNC); return rc; } @@ -220,7 +324,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSStringGetUTF8CString) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringGetUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSStringGetUTF8CString((JSStringRef)arg0, (char *)lparg1, (size_t)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringGetUTF8CString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSStringRef, char *, size_t))fp)((JSStringRef)arg0, (char *)lparg1, (size_t)arg2); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringGetUTF8CString_FUNC); @@ -236,7 +348,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSStringIsEqualToUTF8CString) jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSStringIsEqualToUTF8CString_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* rc = (jint)JSStringIsEqualToUTF8CString((JSStringRef)arg0, (const char *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringIsEqualToUTF8CString) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSStringRef, const char *))fp)((JSStringRef)arg0, (const char *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSStringIsEqualToUTF8CString_FUNC); @@ -249,7 +369,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1JSStringRelease) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1JSStringRelease_FUNC); +/* JSStringRelease((JSStringRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSStringRelease) + if (fp) { + ((void (CALLING_CONVENTION*)(JSStringRef))fp)((JSStringRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSStringRelease_FUNC); } #endif @@ -260,7 +388,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueGetType) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueGetType_FUNC); +/* rc = (jint)JSValueGetType((JSContextRef)arg0, (JSValueRef)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueGetType) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef))fp)((JSContextRef)arg0, (JSValueRef)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueGetType_FUNC); return rc; } @@ -272,7 +408,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueIsObjectOfClass) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueIsObjectOfClass_FUNC); +/* rc = (jint)JSValueIsObjectOfClass((JSContextRef)arg0, (JSValueRef)arg1, (JSClassRef)arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueIsObjectOfClass) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSClassRef))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSClassRef)arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueIsObjectOfClass_FUNC); return rc; } @@ -284,7 +428,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeBoolean) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeBoolean_FUNC); +/* rc = (jintLong)JSValueMakeBoolean((JSContextRef)arg0, (bool)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeBoolean) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, bool))fp)((JSContextRef)arg0, (bool)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeBoolean_FUNC); return rc; } @@ -296,7 +448,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeNumber) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeNumber_FUNC); +/* rc = (jintLong)JSValueMakeNumber((JSContextRef)arg0, (double)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeNumber) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, double))fp)((JSContextRef)arg0, (double)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeNumber_FUNC); return rc; } @@ -308,7 +468,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeString) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeString_FUNC); +/* rc = (jintLong)JSValueMakeString((JSContextRef)arg0, (JSStringRef)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeString) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSStringRef))fp)((JSContextRef)arg0, (JSStringRef)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeString_FUNC); return rc; } @@ -320,7 +488,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueMakeUndefined) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueMakeUndefined_FUNC); +/* rc = (jintLong)JSValueMakeUndefined((JSContextRef)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueMakeUndefined) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef))fp)((JSContextRef)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueMakeUndefined_FUNC); return rc; } @@ -332,7 +508,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1JSValueToBoolean) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToBoolean_FUNC); +/* rc = (jint)JSValueToBoolean((JSContextRef)arg0, (JSValueRef)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToBoolean) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(JSContextRef, JSValueRef))fp)((JSContextRef)arg0, (JSValueRef)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToBoolean_FUNC); return rc; } @@ -346,7 +530,15 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1JSValueToNumber) jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToNumber_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* rc = (jdouble)JSValueToNumber((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToNumber) + if (fp) { + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSValueRef*))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToNumber_FUNC); @@ -362,7 +554,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1JSValueToStringCopy) jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1JSValueToStringCopy_FUNC); if (arg2) if ((lparg2 = (*env)->GetIntLongArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* rc = (jintLong)JSValueToStringCopy((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, JSValueToStringCopy) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(JSContextRef, JSValueRef, JSValueRef*))fp)((JSContextRef)arg0, (JSValueRef)arg1, (JSValueRef*)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseIntLongArrayElements(env, arg2, lparg2, 0); WebKitGTK_NATIVE_EXIT(env, that, _1JSValueToStringCopy_FUNC); @@ -370,18 +570,6 @@ fail: } #endif -#ifndef NO__1SOUP_1IS_1SESSION -JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1SOUP_1IS_1SESSION) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - WebKitGTK_NATIVE_ENTER(env, that, _1SOUP_1IS_1SESSION_FUNC); - rc = (jboolean)SOUP_IS_SESSION(arg0); - WebKitGTK_NATIVE_EXIT(env, that, _1SOUP_1IS_1SESSION_FUNC); - return rc; -} -#endif - #ifndef NO__1SoupCookie_1expires JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupCookie_1expires) (JNIEnv *env, jclass that, jintLong arg0) @@ -428,18 +616,6 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1SoupMessage_1request_1headers) } #endif -#ifndef NO__1WEBKIT_1IS_1WEB_1FRAME -JNIEXPORT jboolean JNICALL WebKitGTK_NATIVE(_1WEBKIT_1IS_1WEB_1FRAME) - (JNIEnv *env, jclass that, jintLong arg0) -{ - jboolean rc = 0; - WebKitGTK_NATIVE_ENTER(env, that, _1WEBKIT_1IS_1WEB_1FRAME_FUNC); - rc = (jboolean)WEBKIT_IS_WEB_FRAME(arg0); - WebKitGTK_NATIVE_EXIT(env, that, _1WEBKIT_1IS_1WEB_1FRAME_FUNC); - return rc; -} -#endif - #ifndef NO__1soup_1auth_1authenticate JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) (JNIEnv *env, jclass that, jintLong arg0, jbyteArray arg1, jbyteArray arg2) @@ -449,7 +625,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1auth_1authenticate) WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1authenticate_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* soup_auth_authenticate((SoupAuth *)arg0, (const char *)lparg1, (const char *)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_authenticate) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupAuth *, const char *, const char *))fp)((SoupAuth *)arg0, (const char *)lparg1, (const char *)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -463,7 +647,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1host) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1host_FUNC); +/* rc = (jintLong)soup_auth_get_host((SoupAuth *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_host) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupAuth *))fp)((SoupAuth *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1host_FUNC); return rc; } @@ -475,7 +667,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1auth_1get_1scheme_1name) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); +/* rc = (jintLong)soup_auth_get_scheme_name((SoupAuth *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_auth_get_scheme_name) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupAuth *))fp)((SoupAuth *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1auth_1get_1scheme_1name_FUNC); return rc; } @@ -486,7 +686,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1add_1cookie) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); +/* soup_cookie_jar_add_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_add_cookie) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupCookieJar *, SoupCookie *))fp)((SoupCookieJar *)arg0, (SoupCookie *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1add_1cookie_FUNC); } #endif @@ -497,7 +705,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1all_1cookies) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); +/* rc = (jintLong)soup_cookie_jar_all_cookies((SoupCookieJar *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_all_cookies) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupCookieJar *))fp)((SoupCookieJar *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1all_1cookies_FUNC); return rc; } @@ -508,7 +724,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1delete_1cookie) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); +/* soup_cookie_jar_delete_cookie((SoupCookieJar *)arg0, (SoupCookie *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_delete_cookie) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupCookieJar *, SoupCookie *))fp)((SoupCookieJar *)arg0, (SoupCookie *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1delete_1cookie_FUNC); } #endif @@ -519,7 +743,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1cookies) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); +/* rc = (jintLong)soup_cookie_jar_get_cookies((SoupCookieJar *)arg0, (SoupURI *)arg1, arg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_cookies) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupCookieJar *, SoupURI *, jint))fp)((SoupCookieJar *)arg0, (SoupURI *)arg1, arg2); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1cookies_FUNC); return rc; } @@ -531,7 +763,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1jar_1get_1type) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); +/* rc = (jintLong)soup_cookie_jar_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_jar_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1jar_1get_1type_FUNC); return rc; } @@ -545,7 +785,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1cookie_1parse) jintLong 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((const char *)lparg0, (SoupURI *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_cookie_parse) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *, SoupURI *))fp)((const char *)lparg0, (SoupURI *)arg1); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1soup_1cookie_1parse_FUNC); @@ -558,7 +806,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1append) (JNIEnv *env, jclass that, jintLong arg0, jint arg1, jintLong arg2, jintLong arg3) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1append_FUNC); +/* soup_message_body_append((SoupMessageBody *)arg0, (SoupMemoryUse)arg1, (gconstpointer)arg2, (gsize)arg3); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_append) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupMessageBody *, SoupMemoryUse, gconstpointer, gsize))fp)((SoupMessageBody *)arg0, (SoupMemoryUse)arg1, (gconstpointer)arg2, (gsize)arg3); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1append_FUNC); } #endif @@ -568,7 +824,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1body_1flatten) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1body_1flatten_FUNC); +/* soup_message_body_flatten((SoupMessageBody *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_body_flatten) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupMessageBody *))fp)((SoupMessageBody *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1body_1flatten_FUNC); } #endif @@ -579,7 +843,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1message_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1get_1uri_FUNC); +/* rc = (jintLong)soup_message_get_uri((SoupMessage *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupMessage *))fp)((SoupMessage *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1message_1get_1uri_FUNC); return rc; } @@ -594,7 +866,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1message_1headers_1append) WebKitGTK_NATIVE_ENTER(env, that, _1soup_1message_1headers_1append_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; +/* soup_message_headers_append((SoupMessageHeaders *)arg0, (const char *)lparg1, (const char *)lparg2); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_message_headers_append) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupMessageHeaders *, const char *, const char *))fp)((SoupMessageHeaders *)arg0, (const char *)lparg1, (const char *)lparg2); + } + } fail: if (arg2 && lparg2) (*env)->ReleaseByteArrayElements(env, arg2, lparg2, 0); if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); @@ -607,7 +887,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1add_1feature_1by_1type) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); +/* soup_session_add_feature_by_type((SoupSession *)arg0, (GType)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_add_feature_by_type) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupSession *, GType))fp)((SoupSession *)arg0, (GType)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1add_1feature_1by_1type_FUNC); } #endif @@ -617,7 +905,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1attach) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1attach_FUNC); +/* soup_session_feature_attach((SoupSessionFeature *)arg0, (SoupSession *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_attach) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupSessionFeature *, SoupSession *))fp)((SoupSessionFeature *)arg0, (SoupSession *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1attach_FUNC); } #endif @@ -627,7 +923,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1session_1feature_1detach) (JNIEnv *env, jclass that, jintLong arg0, jintLong arg1) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1feature_1detach_FUNC); +/* soup_session_feature_detach((SoupSessionFeature *)arg0, (SoupSession *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_feature_detach) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupSessionFeature *, SoupSession *))fp)((SoupSessionFeature *)arg0, (SoupSession *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1feature_1detach_FUNC); } #endif @@ -638,18 +942,54 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1feature) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1feature_FUNC); +/* rc = (jintLong)soup_session_get_feature((SoupSession *)arg0, (GType)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_feature) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupSession *, GType))fp)((SoupSession *)arg0, (GType)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1feature_FUNC); return rc; } #endif +#ifndef NO__1soup_1session_1get_1type +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1soup_1session_1get_1type) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1soup_1session_1get_1type_FUNC); +/* + rc = (jint)soup_session_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_session_get_type) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1soup_1session_1get_1type_FUNC); + return rc; +} +#endif + #ifndef NO__1soup_1uri_1free JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1soup_1uri_1free) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1free_FUNC); +/* soup_uri_free((SoupURI *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_free) + if (fp) { + ((void (CALLING_CONVENTION*)(SoupURI *))fp)((SoupURI *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1free_FUNC); } #endif @@ -662,7 +1002,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1new) jintLong 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((const char *)lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const char *))fp)((const char *)lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1new_FUNC); @@ -676,7 +1024,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1soup_1uri_1to_1string) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1soup_1uri_1to_1string_FUNC); +/* rc = (jintLong)soup_uri_to_string((SoupURI *)arg0, arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, soup_uri_to_string) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(SoupURI *, jint))fp)((SoupURI *)arg0, arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1soup_1uri_1to_1string_FUNC); return rc; } @@ -687,7 +1043,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1cancel) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1cancel_FUNC); +/* webkit_download_cancel((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_cancel) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1cancel_FUNC); } #endif @@ -698,7 +1062,15 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1current_1size) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1current_1size_FUNC); +/* rc = (jlong)webkit_download_get_current_size((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_current_size) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1current_1size_FUNC); return rc; } @@ -710,7 +1082,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1status_FUNC); +/* rc = (jint)webkit_download_get_status((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1status_FUNC); return rc; } @@ -722,7 +1102,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1suggested_1 { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); +/* rc = (jintLong)webkit_download_get_suggested_filename((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_suggested_filename) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1suggested_1filename_FUNC); return rc; } @@ -734,7 +1122,15 @@ JNIEXPORT jlong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1total_1size) { jlong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1total_1size_FUNC); +/* rc = (jlong)webkit_download_get_total_size((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_total_size) + if (fp) { + rc = (jlong)((jlong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1total_1size_FUNC); return rc; } @@ -746,7 +1142,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1download_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1get_1uri_FUNC); +/* rc = (jintLong)webkit_download_get_uri((WebKitDownload *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitDownload *))fp)((WebKitDownload *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1get_1uri_FUNC); return rc; } @@ -759,7 +1163,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1download_1set_1destination_1ur jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* webkit_download_set_destination_uri((WebKitDownload *)arg0, (const gchar *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_download_set_destination_uri) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitDownload *, const gchar *))fp)((WebKitDownload *)arg0, (const gchar *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1download_1set_1destination_1uri_FUNC); @@ -772,7 +1184,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1get_1default_1session) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1get_1default_1session_FUNC); +/* rc = (jintLong)webkit_get_default_session(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_get_default_session) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1get_1default_1session_FUNC); return rc; } @@ -784,7 +1204,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1major_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1major_1version_FUNC); +/* rc = (jint)webkit_major_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_major_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1major_1version_FUNC); return rc; } @@ -796,7 +1224,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1micro_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1micro_1version_FUNC); +/* rc = (jint)webkit_micro_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_micro_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1micro_1version_FUNC); return rc; } @@ -808,7 +1244,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1minor_1version) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1minor_1version_FUNC); +/* rc = (jint)webkit_minor_version(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_minor_version) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1minor_1version_FUNC); return rc; } @@ -820,7 +1264,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1mes { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1message_FUNC); +/* rc = (jintLong)webkit_network_request_get_message((WebKitNetworkRequest *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_message) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitNetworkRequest *))fp)((WebKitNetworkRequest *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1message_FUNC); return rc; } @@ -832,7 +1284,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1get_1uri { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1network_1request_1get_1uri_FUNC); +/* rc = (jintLong)webkit_network_request_get_uri((WebKitNetworkRequest *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitNetworkRequest *))fp)((WebKitNetworkRequest *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1get_1uri_FUNC); return rc; } @@ -846,7 +1306,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1network_1request_1new) jintLong 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((const gchar *)lparg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_network_request_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(const gchar *))fp)((const gchar *)lparg0); + } + } fail: if (arg0 && lparg0) (*env)->ReleaseByteArrayElements(env, arg0, lparg0, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1network_1request_1new_FUNC); @@ -860,7 +1328,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1soup_1auth_1dialog_1get_1t { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); +/* rc = (jintLong)webkit_soup_auth_dialog_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_soup_auth_dialog_get_type) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1soup_1auth_1dialog_1get_1type_FUNC); return rc; } @@ -872,7 +1348,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1da { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); +/* rc = (jintLong)webkit_web_data_source_get_data((WebKitWebDataSource *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_data) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebDataSource *))fp)((WebKitWebDataSource *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1data_FUNC); return rc; } @@ -884,7 +1368,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1data_1source_1get_1en { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); +/* rc = (jintLong)webkit_web_data_source_get_encoding((WebKitWebDataSource *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_data_source_get_encoding) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebDataSource *))fp)((WebKitWebDataSource *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1data_1source_1get_1encoding_FUNC); return rc; } @@ -896,7 +1388,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1data_1sou { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); +/* rc = (jintLong)webkit_web_frame_get_data_source((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_data_source) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1data_1source_FUNC); return rc; } @@ -908,7 +1408,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1global_1c { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); +/* rc = (jintLong)webkit_web_frame_get_global_context((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_global_context) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1global_1context_FUNC); return rc; } @@ -920,7 +1428,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1load_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); +/* rc = (jint)webkit_web_frame_get_load_status((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_load_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1load_1status_FUNC); return rc; } @@ -932,7 +1448,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1parent) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); +/* rc = (jintLong)webkit_web_frame_get_parent((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_parent) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1parent_FUNC); return rc; } @@ -944,19 +1468,55 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1title) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1title_FUNC); +/* rc = (jintLong)webkit_web_frame_get_title((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_title) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1title_FUNC); return rc; } #endif +#ifndef NO__1webkit_1web_1frame_1get_1type +JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1type) + (JNIEnv *env, jclass that) +{ + jint rc = 0; + WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1type_FUNC); +/* + rc = (jint)webkit_web_frame_get_type(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_type) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)())fp)(); + } + } + WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1type_FUNC); + return rc; +} +#endif + #ifndef NO__1webkit_1web_1frame_1get_1uri JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1uri) (JNIEnv *env, jclass that, jintLong arg0) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); +/* rc = (jintLong)webkit_web_frame_get_uri((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1uri_FUNC); return rc; } @@ -968,7 +1528,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1frame_1get_1web_1view { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); +/* rc = (jintLong)webkit_web_frame_get_web_view((WebKitWebFrame *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_frame_get_web_view) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebFrame *))fp)((WebKitWebFrame *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1frame_1get_1web_1view_FUNC); return rc; } @@ -979,7 +1547,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1downloa (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); +/* webkit_web_policy_decision_download((WebKitWebPolicyDecision *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_download) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebPolicyDecision *))fp)((WebKitWebPolicyDecision *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1download_FUNC); } #endif @@ -989,7 +1565,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1policy_1decision_1ignore) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); +/* webkit_web_policy_decision_ignore((WebKitWebPolicyDecision *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_policy_decision_ignore) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebPolicyDecision *))fp)((WebKitWebPolicyDecision *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1policy_1decision_1ignore_FUNC); } #endif @@ -1000,7 +1584,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1back) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); +/* rc = (jint)webkit_web_view_can_go_back((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_back) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1back_FUNC); return rc; } @@ -1012,7 +1604,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1go_1forward) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); +/* rc = (jint)webkit_web_view_can_go_forward((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_go_forward) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1go_1forward_FUNC); return rc; } @@ -1024,7 +1624,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1can_1show_1mime_1ty { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); +/* rc = (jint)webkit_web_view_can_show_mime_type((WebKitWebView *)arg0, (const gchar *)arg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_can_show_mime_type) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)arg1); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1can_1show_1mime_1type_FUNC); return rc; } @@ -1037,7 +1645,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1execute_1script) jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1execute_1script_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* webkit_web_view_execute_script((WebKitWebView *)arg0, (const gchar *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_execute_script) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1execute_1script_FUNC); @@ -1050,7 +1666,15 @@ JNIEXPORT jint JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1load_1status) { jint rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); +/* rc = (jint)webkit_web_view_get_load_status((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_load_status) + if (fp) { + rc = (jint)((jint (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1load_1status_FUNC); return rc; } @@ -1062,7 +1686,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1main_1fram { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); +/* rc = (jintLong)webkit_web_view_get_main_frame((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_main_frame) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1main_1frame_FUNC); return rc; } @@ -1074,7 +1706,15 @@ JNIEXPORT jdouble JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1progress) { jdouble rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1progress_FUNC); +/* rc = (jdouble)webkit_web_view_get_progress((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_progress) + if (fp) { + rc = (jdouble)((jdouble (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1progress_FUNC); return rc; } @@ -1086,7 +1726,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1settings) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1settings_FUNC); +/* rc = (jintLong)webkit_web_view_get_settings((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_settings) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1settings_FUNC); return rc; } @@ -1098,7 +1746,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1title) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1title_FUNC); +/* rc = (jintLong)webkit_web_view_get_title((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_title) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1title_FUNC); return rc; } @@ -1110,7 +1766,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1uri) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1uri_FUNC); +/* rc = (jintLong)webkit_web_view_get_uri((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_uri) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1uri_FUNC); return rc; } @@ -1122,7 +1786,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1get_1window_1fe { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); +/* rc = (jintLong)webkit_web_view_get_window_features((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_get_window_features) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1get_1window_1features_FUNC); return rc; } @@ -1133,7 +1805,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1back) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1back_FUNC); +/* webkit_web_view_go_back((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_back) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1back_FUNC); } #endif @@ -1143,7 +1823,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1go_1forward) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1go_1forward_FUNC); +/* webkit_web_view_go_forward((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_go_forward) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1go_1forward_FUNC); } #endif @@ -1161,7 +1849,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1string) if (arg2) if ((lparg2 = (*env)->GetByteArrayElements(env, arg2, NULL)) == NULL) goto fail; if (arg3) if ((lparg3 = (*env)->GetByteArrayElements(env, arg3, NULL)) == NULL) goto fail; if (arg4) if ((lparg4 = (*env)->GetByteArrayElements(env, arg4, NULL)) == NULL) goto fail; +/* webkit_web_view_load_string((WebKitWebView *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3, (const gchar *)lparg4); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_string) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *, const gchar *, const gchar *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1, (const gchar *)lparg2, (const gchar *)lparg3, (const gchar *)lparg4); + } + } fail: if (arg4 && lparg4) (*env)->ReleaseByteArrayElements(env, arg4, lparg4, 0); if (arg3 && lparg3) (*env)->ReleaseByteArrayElements(env, arg3, lparg3, 0); @@ -1178,7 +1874,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1load_1uri) jbyte *lparg1=NULL; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1load_1uri_FUNC); if (arg1) if ((lparg1 = (*env)->GetByteArrayElements(env, arg1, NULL)) == NULL) goto fail; +/* webkit_web_view_load_uri((WebKitWebView *)arg0, (const gchar *)lparg1); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_load_uri) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *, const gchar *))fp)((WebKitWebView *)arg0, (const gchar *)lparg1); + } + } fail: if (arg1 && lparg1) (*env)->ReleaseByteArrayElements(env, arg1, lparg1, 0); WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1load_1uri_FUNC); @@ -1191,7 +1895,15 @@ JNIEXPORT jintLong JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1new) { jintLong rc = 0; WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1new_FUNC); +/* rc = (jintLong)webkit_web_view_new(); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_new) + if (fp) { + rc = (jintLong)((jintLong (CALLING_CONVENTION*)())fp)(); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1new_FUNC); return rc; } @@ -1202,7 +1914,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1reload) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1reload_FUNC); +/* webkit_web_view_reload((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_reload) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1reload_FUNC); } #endif @@ -1212,7 +1932,15 @@ JNIEXPORT void JNICALL WebKitGTK_NATIVE(_1webkit_1web_1view_1stop_1loading) (JNIEnv *env, jclass that, jintLong arg0) { WebKitGTK_NATIVE_ENTER(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); +/* webkit_web_view_stop_loading((WebKitWebView *)arg0); +*/ + { + WebKitGTK_LOAD_FUNCTION(fp, webkit_web_view_stop_loading) + if (fp) { + ((void (CALLING_CONVENTION*)(WebKitWebView *))fp)((WebKitWebView *)arg0); + } + } WebKitGTK_NATIVE_EXIT(env, that, _1webkit_1web_1view_1stop_1loading_FUNC); } #endif diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h index 90685cf9f9..c0b22e9b8e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h @@ -16,6 +16,7 @@ #ifndef INC_webkitgtk_H #define INC_webkitgtk_H +#include #include #include #include @@ -36,4 +37,18 @@ #include #endif +#define WebKitGTK_LOAD_FUNCTION(var, name) \ + static int initialized = 0; \ + static void *var = NULL; \ + if (!initialized) { \ + void* handle = dlopen("libwebkit-1.0.so.2", LOAD_FLAGS); /* webkitgtk 1.2.x lib */ \ + if (!handle) { \ + handle = dlopen("libwebkitgtk-1.0.so.0", LOAD_FLAGS); /* webkitgtk 1.4.x lib */ \ + } \ + if (handle) { \ + var = dlsym(handle, #name); \ + } \ + initialized = 1; \ + } + #endif /* INC_webkitgtk_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c index 31b101d3e1..fc12f79ed4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.c @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 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 @@ -47,12 +47,10 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1JSValueToBoolean", "_1JSValueToNumber", "_1JSValueToStringCopy", - "_1SOUP_1IS_1SESSION", "_1SoupCookie_1expires", "_1SoupMessage_1method", "_1SoupMessage_1request_1body", "_1SoupMessage_1request_1headers", - "_1WEBKIT_1IS_1WEB_1FRAME", "_1soup_1auth_1authenticate", "_1soup_1auth_1get_1host", "_1soup_1auth_1get_1scheme_1name", @@ -70,6 +68,7 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1soup_1session_1feature_1attach", "_1soup_1session_1feature_1detach", "_1soup_1session_1get_1feature", + "_1soup_1session_1get_1type", "_1soup_1uri_1free", "_1soup_1uri_1new", "_1soup_1uri_1to_1string", @@ -95,6 +94,7 @@ char * WebKitGTK_nativeFunctionNames[] = { "_1webkit_1web_1frame_1get_1load_1status", "_1webkit_1web_1frame_1get_1parent", "_1webkit_1web_1frame_1get_1title", + "_1webkit_1web_1frame_1get_1type", "_1webkit_1web_1frame_1get_1uri", "_1webkit_1web_1frame_1get_1web_1view", "_1webkit_1web_1policy_1decision_1download", diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h index 69398a9b36..26aeec72b0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk_stats.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2011 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 @@ -55,12 +55,10 @@ typedef enum { _1JSValueToBoolean_FUNC, _1JSValueToNumber_FUNC, _1JSValueToStringCopy_FUNC, - _1SOUP_1IS_1SESSION_FUNC, _1SoupCookie_1expires_FUNC, _1SoupMessage_1method_FUNC, _1SoupMessage_1request_1body_FUNC, _1SoupMessage_1request_1headers_FUNC, - _1WEBKIT_1IS_1WEB_1FRAME_FUNC, _1soup_1auth_1authenticate_FUNC, _1soup_1auth_1get_1host_FUNC, _1soup_1auth_1get_1scheme_1name_FUNC, @@ -78,6 +76,7 @@ typedef enum { _1soup_1session_1feature_1attach_FUNC, _1soup_1session_1feature_1detach_FUNC, _1soup_1session_1get_1feature_FUNC, + _1soup_1session_1get_1type_FUNC, _1soup_1uri_1free_FUNC, _1soup_1uri_1new_FUNC, _1soup_1uri_1to_1string_FUNC, @@ -103,6 +102,7 @@ typedef enum { _1webkit_1web_1frame_1get_1load_1status_FUNC, _1webkit_1web_1frame_1get_1parent_FUNC, _1webkit_1web_1frame_1get_1title_FUNC, + _1webkit_1web_1frame_1get_1type_FUNC, _1webkit_1web_1frame_1get_1uri_FUNC, _1webkit_1web_1frame_1get_1web_1view_FUNC, _1webkit_1web_1policy_1decision_1download_FUNC, 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 087bd2247f..9bd57205c3 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 @@ -89,20 +89,10 @@ class WebKit extends WebBrowser { static Callback JSObjectHasPropertyProc, JSObjectGetPropertyProc, JSObjectCallAsFunctionProc; static { - - /* - * WebKitGTK is binary-incompatible between its 1.2 and 1.4 releases, - * so swt has separate libraries compiled against each. - */ try { - Library.loadLibrary ("swt-webkit12"); // $NON-NLS-1$ + Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ LibraryLoaded = true; } catch (Throwable e) { - try { - Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ - LibraryLoaded = true; - } catch (Throwable e2) { - } } if (LibraryLoaded) { @@ -286,7 +276,7 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ u } int /*long*/ webView; - if (WebKitGTK.WEBKIT_IS_WEB_FRAME (handle)) { + if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.webkit_web_frame_get_type ())) { webView = WebKitGTK.webkit_web_frame_get_web_view (handle); } else { webView = handle; @@ -310,7 +300,7 @@ static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ a static int /*long*/ Proc (int /*long*/ handle, int /*long*/ arg0, int /*long*/ arg1, int /*long*/ arg2, int /*long*/ user_data) { int /*long*/ webView; - if (WebKitGTK.SOUP_IS_SESSION (handle)) { + if (OS.G_TYPE_CHECK_INSTANCE_TYPE (handle, WebKitGTK.soup_session_get_type ())) { webView = user_data; } else { webView = handle; 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 01bbe98be5..5540f843f7 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 @@ -80,6 +80,7 @@ protected static byte [] ascii (String name) { /** + * @method flags=dynamic * @param definition cast=(const JSClassDefinition*) */ public static final native int /*long*/ _JSClassCreate (int /*long*/ definition); @@ -93,6 +94,7 @@ public static final int /*long*/ JSClassCreate (int /*long*/ definition) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) */ public static final native int /*long*/ _JSContextGetGlobalObject (int /*long*/ ctx); @@ -106,6 +108,7 @@ public static final int /*long*/ JSContextGetGlobalObject (int /*long*/ ctx) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param script cast=(JSStringRef) * @param thisObject cast=(JSObjectRef) @@ -123,6 +126,7 @@ public static final int /*long*/ JSEvaluateScript (int /*long*/ ctx, int /*long* } /** + * @method flags=dynamic * @param object cast=(JSObjectRef) */ public static final native int /*long*/ _JSObjectGetPrivate (int /*long*/ object); @@ -136,6 +140,7 @@ public static final int /*long*/ JSObjectGetPrivate (int /*long*/ object) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyName cast=(JSStringRef) @@ -152,6 +157,7 @@ public static final int /*long*/ JSObjectGetProperty (int /*long*/ ctx, int /*lo } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyIndex cast=(unsigned) @@ -168,6 +174,7 @@ public static final int /*long*/ JSObjectGetPropertyAtIndex (int /*long*/ ctx, i } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param jsClass cast=(JSClassRef) * @param data cast=(void *) @@ -183,6 +190,7 @@ public static final int /*long*/ JSObjectMake (int /*long*/ ctx, int /*long*/ js } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param argumentCount cast=(size_t) * @param arguments cast=(const struct OpaqueJSValue * const*) @@ -199,6 +207,7 @@ public static final int /*long*/ JSObjectMakeArray (int /*long*/ ctx, int /*long } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param name cast=(JSStringRef) * @param callAsFunction cast=(JSObjectCallAsFunctionCallback) @@ -214,6 +223,7 @@ public static final int /*long*/ JSObjectMakeFunctionWithCallback (int /*long*/ } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param object cast=(JSObjectRef) * @param propertyName cast=(JSStringRef) @@ -232,6 +242,7 @@ public static final void JSObjectSetProperty (int /*long*/ ctx, int /*long*/ obj } /** + * @method flags=dynamic * @param string cast=(const char *) */ public static final native int /*long*/ _JSStringCreateWithUTF8CString (byte[] string); @@ -245,6 +256,7 @@ public static final int /*long*/ JSStringCreateWithUTF8CString (byte[] string) { } /** + * @method flags=dynamic * @param string cast=(JSStringRef) */ public static final native int /*long*/ _JSStringGetLength (int /*long*/ string); @@ -258,6 +270,7 @@ public static final int /*long*/ JSStringGetLength (int /*long*/ string) { } /** + * @method flags=dynamic * @param string cast=(JSStringRef) */ public static final native int /*long*/ _JSStringGetMaximumUTF8CStringSize (int /*long*/ string); @@ -271,6 +284,7 @@ public static final int /*long*/ JSStringGetMaximumUTF8CStringSize (int /*long*/ } /** + * @method flags=dynamic * @param string cast=(JSStringRef) * @param buffer cast=(char *) * @param bufferSize cast=(size_t) @@ -286,6 +300,7 @@ public static final int /*long*/ JSStringGetUTF8CString (int /*long*/ string, by } /** + * @method flags=dynamic * @param a cast=(JSStringRef) * @param b cast=(const char *) */ @@ -300,6 +315,7 @@ public static final int JSStringIsEqualToUTF8CString (int /*long*/ a, byte[] b) } /** + * @method flags=dynamic * @param string cast=(JSStringRef) */ public static final native void _JSStringRelease (int /*long*/ string); @@ -313,6 +329,7 @@ public static final void JSStringRelease (int /*long*/ string) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) */ @@ -327,6 +344,7 @@ public static final int JSValueGetType (int /*long*/ ctx, int /*long*/ value) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param jsClass cast=(JSClassRef) @@ -342,6 +360,7 @@ public static final int JSValueIsObjectOfClass (int /*long*/ ctx, int /*long*/ v } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param bool cast=(bool) */ @@ -356,6 +375,7 @@ public static final int /*long*/ JSValueMakeBoolean (int /*long*/ ctx, int bool) } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param number cast=(double) */ @@ -370,6 +390,7 @@ public static final int /*long*/ JSValueMakeNumber (int /*long*/ ctx, double num } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param string cast=(JSStringRef) */ @@ -384,6 +405,7 @@ public static final int /*long*/ JSValueMakeString (int /*long*/ ctx, int /*long } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) */ public static final native int /*long*/ _JSValueMakeUndefined (int /*long*/ ctx); @@ -397,6 +419,7 @@ public static final int /*long*/ JSValueMakeUndefined (int /*long*/ ctx) { } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) */ @@ -411,6 +434,7 @@ public static final int JSValueToBoolean (int /*long*/ ctx, int /*long*/ value) } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) @@ -426,6 +450,7 @@ public static final double JSValueToNumber (int /*long*/ ctx, int /*long*/ value } /** + * @method flags=dynamic * @param ctx cast=(JSContextRef) * @param value cast=(JSValueRef) * @param exception cast=(JSValueRef*) @@ -443,6 +468,7 @@ public static final int /*long*/ JSValueToStringCopy (int /*long*/ ctx, int /*lo /* --------------------- start libsoup natives --------------------- */ /** + * @method flags=dynamic * @param auth cast=(SoupAuth *) * @param username cast=(const char *) * @param password cast=(const char *) @@ -458,6 +484,7 @@ public static final void soup_auth_authenticate (int /*long*/ auth, byte[] usern } /** + * @method flags=dynamic * @param auth cast=(SoupAuth *) */ public static final native int /*long*/ _soup_auth_get_host (int /*long*/ auth); @@ -471,6 +498,7 @@ public static final int /*long*/ soup_auth_get_host (int /*long*/ auth) { } /** + * @method flags=dynamic * @param auth cast=(SoupAuth *) */ public static final native int /*long*/ _soup_auth_get_scheme_name (int /*long*/ auth); @@ -484,6 +512,7 @@ public static final int /*long*/ soup_auth_get_scheme_name (int /*long*/ auth) { } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) * @param cookie cast=(SoupCookie *) */ @@ -498,6 +527,7 @@ public static final void soup_cookie_jar_add_cookie (int /*long*/ jar, int /*lon } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) */ public static final native int /*long*/ _soup_cookie_jar_all_cookies (int /*long*/ jar); @@ -511,6 +541,7 @@ public static final int /*long*/ soup_cookie_jar_all_cookies (int /*long*/ jar) } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) * @param cookie cast=(SoupCookie *) */ @@ -525,6 +556,7 @@ public static final void soup_cookie_jar_delete_cookie (int /*long*/ jar, int /* } /** + * @method flags=dynamic * @param jar cast=(SoupCookieJar *) * @param uri cast=(SoupURI *) */ @@ -538,6 +570,9 @@ public static final int /*long*/ soup_cookie_jar_get_cookies (int /*long*/ jar, } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _soup_cookie_jar_get_type (); public static final int /*long*/ soup_cookie_jar_get_type () { lock.lock(); @@ -549,6 +584,7 @@ public static final int /*long*/ soup_cookie_jar_get_type () { } /** + * @method flags=dynamic * @param header cast=(const char *) * @param origin cast=(SoupURI *) */ @@ -563,73 +599,7 @@ public static final int /*long*/ soup_cookie_parse (byte[] header, int /*long*/ } /** - * @method flags=getter - * @param cookie cast=(SoupCookie *) - */ -public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie); -public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { - lock.lock(); - try { - return _SoupCookie_expires (cookie); - } finally { - lock.unlock(); - } -} - -public static final native boolean _SOUP_IS_SESSION (int /*long*/ object); -public static final boolean SOUP_IS_SESSION (int /*long*/ object) { - lock.lock(); - try { - return _SOUP_IS_SESSION (object); - } finally { - lock.unlock(); - } -} - -/** - * @method flags=setter - * @param message cast=(SoupMessage *) - * @param method cast=(const char *) - */ -public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method); -public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) { - lock.lock(); - try { - _SoupMessage_method (message, method); - } finally { - lock.unlock(); - } -} - -/** - * @method flags=getter - * @param message cast=(SoupMessage *) - */ -public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) { - lock.lock(); - try { - return _SoupMessage_request_body (message); - } finally { - lock.unlock(); - } -} - -/** - * @method flags=getter - * @param message cast=(SoupMessage *) - */ -public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message); -public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) { - lock.lock(); - try { - return _SoupMessage_request_headers (message); - } finally { - lock.unlock(); - } -} - -/** + * @method flags=dynamic * @param body cast=(SoupMessageBody *) * @param use cast=(SoupMemoryUse) * @param data cast=(gconstpointer) @@ -646,6 +616,7 @@ public static final void soup_message_body_append (int /*long*/ body, int use, i } /** + * @method flags=dynamic * @param body cast=(SoupMessageBody *) */ public static final native void _soup_message_body_flatten (int /*long*/ body); @@ -659,6 +630,7 @@ public static final void soup_message_body_flatten (int /*long*/ body) { } /** + * @method flags=dynamic * @param msg cast=(SoupMessage *) */ public static final native int /*long*/ _soup_message_get_uri (int /*long*/ msg); @@ -672,6 +644,7 @@ public static final int /*long*/ soup_message_get_uri (int /*long*/ msg) { } /** + * @method flags=dynamic * @param headers cast=(SoupMessageHeaders *) * @param name cast=(const char *) * @param value cast=(const char *) @@ -687,6 +660,7 @@ public static final void soup_message_headers_append (int /*long*/ headers, byte } /** + * @method flags=dynamic * @param session cast=(SoupSession *) * @param type cast=(GType) */ @@ -701,6 +675,7 @@ public static final void soup_session_add_feature_by_type (int /*long*/ session, } /** + * @method flags=dynamic * @param session cast=(SoupSession *) * @param feature_type cast=(GType) */ @@ -715,6 +690,7 @@ public static final int /*long*/ soup_session_get_feature (int /*long*/ session, } /** + * @method flags=dynamic * @param feature cast=(SoupSessionFeature *) * @param session cast=(SoupSession *) */ @@ -729,6 +705,20 @@ public static final void soup_session_feature_attach (int /*long*/ feature, int } /** + * @method flags=dynamic + */ +public static final native int _soup_session_get_type (); +public static final int soup_session_get_type () { + lock.lock(); + try { + return _soup_session_get_type (); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=dynamic * @param feature cast=(SoupSessionFeature *) * @param session cast=(SoupSession *) */ @@ -743,6 +733,7 @@ public static final void soup_session_feature_detach (int /*long*/ feature, int } /** + * @method flags=dynamic * @param uri cast=(SoupURI *) */ public static final native void _soup_uri_free (int /*long*/ uri); @@ -756,6 +747,7 @@ public static final void soup_uri_free (int /*long*/ uri) { } /** + * @method flags=dynamic * @param uri_string cast=(const char *) */ public static final native int /*long*/ _soup_uri_new (byte[] uri_string); @@ -769,6 +761,7 @@ public static final int /*long*/ soup_uri_new (byte[] uri_string) { } /** + * @method flags=dynamic * @param uri cast=(SoupURI *) */ public static final native int /*long*/ _soup_uri_to_string (int /*long*/ uri, int just_path_and_query); @@ -784,6 +777,7 @@ public static final int /*long*/ soup_uri_to_string (int /*long*/ uri, int just_ /* --------------------- start WebKitGTK natives --------------------- */ /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native void _webkit_download_cancel (int /*long*/ download); @@ -797,6 +791,7 @@ public static final void webkit_download_cancel (int /*long*/ download) { } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native long _webkit_download_get_current_size (int /*long*/ download); @@ -810,6 +805,7 @@ public static final long webkit_download_get_current_size (int /*long*/ download } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native int _webkit_download_get_status (int /*long*/ download); @@ -823,6 +819,7 @@ public static final int webkit_download_get_status (int /*long*/ download) { } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native int /*long*/ _webkit_download_get_suggested_filename (int /*long*/ download); @@ -836,6 +833,7 @@ public static final int /*long*/ webkit_download_get_suggested_filename (int /*l } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native long _webkit_download_get_total_size (int /*long*/ download); @@ -849,6 +847,7 @@ public static final long webkit_download_get_total_size (int /*long*/ download) } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) */ public static final native int /*long*/ _webkit_download_get_uri (int /*long*/ download); @@ -862,6 +861,7 @@ public static final int /*long*/ webkit_download_get_uri (int /*long*/ download) } /** + * @method flags=dynamic * @param download cast=(WebKitDownload *) * @param destination_uri cast=(const gchar *) */ @@ -875,6 +875,9 @@ public static final void webkit_download_set_destination_uri (int /*long*/ downl } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _webkit_get_default_session (); public static final int /*long*/ webkit_get_default_session () { lock.lock(); @@ -885,16 +888,9 @@ public static final int /*long*/ webkit_get_default_session () { } } -public static final native boolean _WEBKIT_IS_WEB_FRAME (int /*long*/ object); -public static final boolean WEBKIT_IS_WEB_FRAME (int /*long*/ object) { - lock.lock(); - try { - return _WEBKIT_IS_WEB_FRAME (object); - } finally { - lock.unlock(); - } -} - +/** + * @method flags=dynamic + */ public static final native int _webkit_major_version (); public static final int webkit_major_version () { lock.lock(); @@ -905,6 +901,9 @@ public static final int webkit_major_version () { } } +/** + * @method flags=dynamic + */ public static final native int _webkit_micro_version (); public static final int webkit_micro_version () { lock.lock(); @@ -915,6 +914,9 @@ public static final int webkit_micro_version () { } } +/** + * @method flags=dynamic + */ public static final native int _webkit_minor_version (); public static final int webkit_minor_version () { lock.lock(); @@ -926,6 +928,7 @@ public static final int webkit_minor_version () { } /** + * @method flags=dynamic * @param request cast=(WebKitNetworkRequest *) */ public static final native int /*long*/ _webkit_network_request_get_message (int /*long*/ request); @@ -939,6 +942,7 @@ public static final int /*long*/ webkit_network_request_get_message (int /*long* } /** + * @method flags=dynamic * @param request cast=(WebKitNetworkRequest *) */ public static final native int /*long*/ _webkit_network_request_get_uri (int /*long*/ request); @@ -952,6 +956,7 @@ public static final int /*long*/ webkit_network_request_get_uri (int /*long*/ re } /** + * @method flags=dynamic * @param uri cast=(const gchar *) */ public static final native int /*long*/ _webkit_network_request_new (byte[] uri); @@ -964,6 +969,9 @@ public static final int /*long*/ webkit_network_request_new (byte[] uri) { } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _webkit_soup_auth_dialog_get_type (); public static final int /*long*/ webkit_soup_auth_dialog_get_type () { lock.lock(); @@ -975,6 +983,7 @@ public static final int /*long*/ webkit_soup_auth_dialog_get_type () { } /** + * @method flags=dynamic * @param data_source cast=(WebKitWebDataSource *) */ public static final native int /*long*/ _webkit_web_data_source_get_data (int /*long*/ data_source); @@ -988,6 +997,7 @@ public static final int /*long*/ webkit_web_data_source_get_data (int /*long*/ d } /** + * @method flags=dynamic * @param data_source cast=(WebKitWebDataSource *) */ public static final native int /*long*/ _webkit_web_data_source_get_encoding (int /*long*/ data_source); @@ -1001,6 +1011,7 @@ public static final int /*long*/ webkit_web_data_source_get_encoding (int /*long } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_data_source (int /*long*/ frame); @@ -1014,6 +1025,7 @@ public static final int /*long*/ webkit_web_frame_get_data_source (int /*long*/ } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_global_context (int /*long*/ frame); @@ -1027,6 +1039,7 @@ public static final int /*long*/ webkit_web_frame_get_global_context (int /*long } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int _webkit_web_frame_get_load_status (int /*long*/ frame); @@ -1040,6 +1053,7 @@ public static final int webkit_web_frame_get_load_status (int /*long*/ frame) { } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_parent (int /*long*/ frame); @@ -1053,6 +1067,7 @@ public static final int /*long*/ webkit_web_frame_get_parent (int /*long*/ frame } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_title (int /*long*/ frame); @@ -1066,6 +1081,20 @@ public static final int /*long*/ webkit_web_frame_get_title (int /*long*/ frame) } /** + * @method flags=dynamic + */ +public static final native int _webkit_web_frame_get_type (); +public static final int webkit_web_frame_get_type () { + lock.lock(); + try { + return _webkit_web_frame_get_type (); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_uri (int /*long*/ frame); @@ -1079,6 +1108,7 @@ public static final int /*long*/ webkit_web_frame_get_uri (int /*long*/ frame) { } /** + * @method flags=dynamic * @param frame cast=(WebKitWebFrame *) */ public static final native int /*long*/ _webkit_web_frame_get_web_view (int /*long*/ frame); @@ -1092,6 +1122,7 @@ public static final int /*long*/ webkit_web_frame_get_web_view (int /*long*/ fra } /** + * @method flags=dynamic * @param decision cast=(WebKitWebPolicyDecision *) */ public static final native void _webkit_web_policy_decision_download (int /*long*/ decision); @@ -1105,6 +1136,7 @@ public static final void webkit_web_policy_decision_download (int /*long*/ decis } /** + * @method flags=dynamic * @param decision cast=(WebKitWebPolicyDecision *) */ public static final native void _webkit_web_policy_decision_ignore (int /*long*/ decision); @@ -1118,6 +1150,7 @@ public static final void webkit_web_policy_decision_ignore (int /*long*/ decisio } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int _webkit_web_view_can_go_back (int /*long*/ web_view); @@ -1131,6 +1164,7 @@ public static final int webkit_web_view_can_go_back (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int _webkit_web_view_can_go_forward (int /*long*/ web_view); @@ -1144,6 +1178,7 @@ public static final int webkit_web_view_can_go_forward (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param mime_type cast=(const gchar *) */ @@ -1158,6 +1193,7 @@ public static final int webkit_web_view_can_show_mime_type (int /*long*/ web_vie } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param script cast=(const gchar *) */ @@ -1172,6 +1208,7 @@ public static final void webkit_web_view_execute_script (int /*long*/ web_view, } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int _webkit_web_view_get_load_status (int /*long*/ web_view); @@ -1185,6 +1222,7 @@ public static final int webkit_web_view_get_load_status (int /*long*/ web_view) } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_main_frame (int /*long*/ web_view); @@ -1198,6 +1236,7 @@ public static final int /*long*/ webkit_web_view_get_main_frame (int /*long*/ we } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native double _webkit_web_view_get_progress (int /*long*/ web_view); @@ -1211,6 +1250,7 @@ public static final double webkit_web_view_get_progress (int /*long*/ web_view) } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_settings (int /*long*/ web_view); @@ -1224,6 +1264,7 @@ public static final int /*long*/ webkit_web_view_get_settings (int /*long*/ web_ } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_title (int /*long*/ web_view); @@ -1237,6 +1278,7 @@ public static final int /*long*/ webkit_web_view_get_title (int /*long*/ web_vie } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_uri (int /*long*/ web_view); @@ -1250,6 +1292,7 @@ public static final int /*long*/ webkit_web_view_get_uri (int /*long*/ web_view) } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native int /*long*/ _webkit_web_view_get_window_features (int /*long*/ web_view); @@ -1263,6 +1306,7 @@ public static final int /*long*/ webkit_web_view_get_window_features (int /*long } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_go_back (int /*long*/ web_view); @@ -1276,6 +1320,7 @@ public static final void webkit_web_view_go_back (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_go_forward (int /*long*/ web_view); @@ -1289,6 +1334,7 @@ public static final void webkit_web_view_go_forward (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param content cast=(const gchar *) * @param mime_type cast=(const gchar *) @@ -1306,6 +1352,7 @@ public static final void webkit_web_view_load_string (int /*long*/ web_view, byt } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) * @param uri cast=(const gchar *) */ @@ -1319,6 +1366,9 @@ public static final void webkit_web_view_load_uri (int /*long*/ web_view, byte[] } } +/** + * @method flags=dynamic + */ public static final native int /*long*/ _webkit_web_view_new (); public static final int /*long*/ webkit_web_view_new () { lock.lock(); @@ -1330,6 +1380,7 @@ public static final int /*long*/ webkit_web_view_new () { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_reload (int /*long*/ web_view); @@ -1343,6 +1394,7 @@ public static final void webkit_web_view_reload (int /*long*/ web_view) { } /** + * @method flags=dynamic * @param web_view cast=(WebKitWebView *) */ public static final native void _webkit_web_view_stop_loading (int /*long*/ web_view); @@ -1366,4 +1418,61 @@ public static final native int JSClassDefinition_sizeof (); */ public static final native void memmove (int /*long*/ dest, JSClassDefinition src, int /*long*/ size); +/** + * @method flags=getter + * @param cookie cast=(SoupCookie *) + */ +public static final native int /*long*/ _SoupCookie_expires (int /*long*/ cookie); +public static final int /*long*/ SoupCookie_expires (int /*long*/ cookie) { + lock.lock(); + try { + return _SoupCookie_expires (cookie); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=setter + * @param message cast=(SoupMessage *) + * @param method cast=(const char *) + */ +public static final native void _SoupMessage_method (int /*long*/ message, int /*long*/ method); +public static final void SoupMessage_method (int /*long*/ message, int /*long*/ method) { + lock.lock(); + try { + _SoupMessage_method (message, method); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=getter + * @param message cast=(SoupMessage *) + */ +public static final native int /*long*/ _SoupMessage_request_body (int /*long*/ message); +public static final int /*long*/ SoupMessage_request_body (int /*long*/ message) { + lock.lock(); + try { + return _SoupMessage_request_body (message); + } finally { + lock.unlock(); + } +} + +/** + * @method flags=getter + * @param message cast=(SoupMessage *) + */ +public static final native int /*long*/ _SoupMessage_request_headers (int /*long*/ message); +public static final int /*long*/ SoupMessage_request_headers (int /*long*/ message) { + lock.lock(); + try { + return _SoupMessage_request_headers (message); + } finally { + lock.unlock(); + } +} + } diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h index 583f87673c..f25a2d2c36 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32.h @@ -22,5 +22,7 @@ #include #include "webkit_win32_custom.h" +#define WebKit_LOAD_FUNCTION LOAD_FUNCTION + #endif /* INC_webkit_win32_H */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp index 5193f7666b..a1860586a5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library/webkit_win32_custom.cpp @@ -88,7 +88,7 @@ JNIEXPORT jint JNICALL WebKit_win32_NATIVE(WebKitCreateInstance) rc = (jint)WebKitCreateInstance(lparg0, arg1, lparg2, lparg3); */ { - LOAD_FUNCTION(fp, WebKitCreateInstance) + WebKit_LOAD_FUNCTION(fp, WebKitCreateInstance) if (fp) { rc = (jint)((jint (*)(jbyte *, jintLong, jbyte *, jintLong *))fp)(lparg0, arg1, lparg2, lparg3); } -- cgit