Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 366617 - Crash when running JavaXPCOM in IBM JVM; Bug 335696 - Provide helper method for embedding in AWT/Swing. a=jay. XULRunner only. Not part of default build.

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@218602 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pedemont%us.ibm.com
2007-01-18 19:36:13 +00:00
parent 5f111ef60f
commit cdd8cf60bd
12 changed files with 181 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/extensions/java/xpcom/nsJavaWrapper.cpp
View File

@@ -1359,7 +1359,7 @@ QueryMethodInfo(nsIInterfaceInfo* aIInfo, const char* aMethodName,
/**
* org.mozilla.xpcom.XPCOMJavaProxy.internal.callXPCOMMethod
*/
extern "C" NS_EXPORT jobject
extern "C" NS_EXPORT jobject JNICALL
JAVAPROXY_NATIVE(callXPCOMMethod) (JNIEnv *env, jclass that, jobject aJavaProxy,
jstring aMethodName, jobjectArray aParams)
{
@@ -1669,7 +1669,7 @@ GetXPCOMInstFromProxy(JNIEnv* env, jobject aJavaObject, void** aResult)
/**
* org.mozilla.xpcom.internal.XPCOMJavaProxy.finalizeProxy
*/
extern "C" NS_EXPORT void
extern "C" NS_EXPORT void JNICALL
JAVAPROXY_NATIVE(finalizeProxy) (JNIEnv *env, jclass that, jobject aJavaProxy)
{
#ifdef DEBUG_JAVAXPCOM
@@ -1721,7 +1721,7 @@ JAVAPROXY_NATIVE(finalizeProxy) (JNIEnv *env, jclass that, jobject aJavaProxy)
/**
* org.mozilla.xpcom.XPCOMJavaProxy.isSameXPCOMObject
*/
extern "C" NS_EXPORT jboolean
extern "C" NS_EXPORT jboolean JNICALL
JAVAPROXY_NATIVE(isSameXPCOMObject) (JNIEnv *env, jclass that,
jobject aProxy1, jobject aProxy2)
{
@@ -1744,7 +1744,7 @@ JAVAPROXY_NATIVE(isSameXPCOMObject) (JNIEnv *env, jclass that,
/**
* org.mozilla.xpcom.ProfileLock.release
*/
extern "C" NS_EXPORT void
extern "C" NS_EXPORT void JNICALL
LOCKPROXY_NATIVE(release) (JNIEnv *env, jclass that, jlong aLockObject)
{
// Need to release object on the main thread.