diff options
author | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-09 13:59:54 -0400 |
---|---|---|
committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-04-11 11:48:41 -0400 |
commit | 650deb026c998b07523a6424f11db72ac0bd1b3a (patch) | |
tree | 7e21b10aa6f01468cd566bdf6e7ef3044a8dd88f /bundles/org.eclipse.swt/Eclipse SWT Mozilla | |
parent | 7200929f782cfe54550f7739341cd75b7329e7bc (diff) | |
download | eclipse.platform.swt-650deb026c998b07523a6424f11db72ac0bd1b3a.tar.gz eclipse.platform.swt-650deb026c998b07523a6424f11db72ac0bd1b3a.tar.xz eclipse.platform.swt-650deb026c998b07523a6424f11db72ac0bd1b3a.zip |
initial 64-bit XULRunner commit
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Mozilla')
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext-2.h (renamed from bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject-2.h (renamed from bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h) | 0 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp | 25 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp | 5 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h | 5 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java | 18 |
7 files changed, 10 insertions, 45 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext-2.h index 783cf3d34f..783cf3d34f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptContext-2.h diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject-2.h index 276d40f4d5..276d40f4d5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/nsIScriptGlobalObject-2.h diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp index 026e178742..580fb4b1f6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp @@ -67,31 +67,6 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJ)(JNIEnv *env, jclass that, jint } #endif -#if (!defined(NO__1Call__IIIIII) && !defined(JNI64)) || (!defined(NO__1Call__JJJJJI) && defined(JNI64)) -#ifndef JNI64 -extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5); -JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__IIIIII)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5) -#else -extern "C" JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5); -JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJJI)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jintLong arg3, jintLong arg4, jint arg5) -#endif -{ - jint rc = 0; -#ifndef JNI64 - XPCOM_NATIVE_ENTER(env, that, _1Call__IIIIII_FUNC); -#else - XPCOM_NATIVE_ENTER(env, that, _1Call__JJJJJI_FUNC); -#endif - rc = (jint)((SWT_XREInitEmbedding)arg0)((nsILocalFile *)arg1, (nsILocalFile *)arg2, (nsIDirectoryServiceProvider *)arg3, (nsStaticModuleInfo const *)arg4, arg5); -#ifndef JNI64 - XPCOM_NATIVE_EXIT(env, that, _1Call__IIIIII_FUNC); -#else - XPCOM_NATIVE_EXIT(env, that, _1Call__JJJJJI_FUNC); -#endif - return rc; -} -#endif - #if (!defined(NO__1Call__III_3BII_3I) && !defined(JNI64)) || (!defined(NO__1Call__JJJ_3BII_3I) && defined(JNI64)) #ifndef JNI64 extern "C" JNIEXPORT jintLong JNICALL XPCOM_NATIVE(_1Call__III_3BII_3I)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintLong arg2, jbyteArray arg3, jint arg4, jint arg5, jintArray arg6); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp index c51c1689e3..f1e52b40b3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.cpp @@ -27,11 +27,6 @@ char * XPCOM_nativeFunctionNames[] = { "_1Call__JJJJ", #endif #ifndef JNI64 - "_1Call__IIIIII", -#else - "_1Call__JJJJJI", -#endif -#ifndef JNI64 "_1Call__III_3BII_3I", #else "_1Call__JJJ_3BII_3I", diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h index ff1e3a0e5a..afa3bb90c8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom_stats.h @@ -37,11 +37,6 @@ typedef enum { _1Call__JJJJ_FUNC, #endif #ifndef JNI64 - _1Call__IIIIII_FUNC, -#else - _1Call__JJJJJI_FUNC, -#endif -#ifndef JNI64 _1Call__III_3BII_3I_FUNC, #else _1Call__JJJ_3BII_3I_FUNC, diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index 40f2af1945..7002315ecb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -2036,7 +2036,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { error (XPCOM.NS_ERROR_NULL_POINTER); } if (IsPre_4) { - rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0); +// rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0); } else { rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress ()); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java index b5c7f2751a..e513e3a823 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java @@ -607,15 +607,15 @@ public static final long /*int*/ Call(long /*int*/ ptr, long /*int*/ aInStream, * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *) * @param aStaticComponents cast=(nsStaticModuleInfo const *) */ -public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount); -public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount) { - lock.lock(); - try { - return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount); - } finally { - lock.unlock(); - } -} +//public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount); +//public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider, long /*int*/ aStaticComponents, int aStaticComponentsCount) { +// lock.lock(); +// try { +// return _Call(ptr, aLibXULDirectory, aAppDirectory, aAppDirProvider, aStaticComponents, aStaticComponentsCount); +// } finally { +// lock.unlock(); +// } +//} /** * @param ptr cast=(SWT_XREInitEmbedding2) |