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

bug=32011

Browse Source 
r=ashuk
a=edburns
This set of changes replaces all occurrences of

env->Func(args...)

with

::util_Func(env, args...)

Except of course, for the implementations of the above mentioned
::util_Func() functions.

This is done to allow the JNI functions to be called from a non JNI
context, such as UNO.


git-svn-id: svn://10.0.0.236/trunk@63190 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2000-03-16 23:07:03 +00:00
parent 53322f1498
commit b233b02f87
13 changed files with 337 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
mozilla/java/webclient/src_moz/DocumentLoaderObserverImpl.cpp
View File

@@ -78,24 +78,9 @@ DocumentLoaderObserverImpl::DocumentLoaderObserverImpl(JNIEnv *env,
mJNIEnv(env), mInitContext(yourInitContext), mTarget(yourTarget)
{
if (nsnull == gVm) { // declared in jni_util.h
env->GetJavaVM(&gVm); // save this vm reference away for the callback!
::util_GetJavaVM(env, &gVm); // save this vm reference away for the callback!
}
#ifdef XP_PC
// debug: edburns:
DWORD nativeThreadID = GetCurrentThreadId();
printf("debug: edburns: DocumentLoaderObserverImpl ctor nativeThreadID: %d\n",
nativeThreadID);
#endif
char *currentThreadName = nsnull;
if (nsnull != (currentThreadName = util_GetCurrentThreadName(env))) {
printf("debug: edburns: DocumentLoaderObserverImpl ctor threadName: %s\n",
currentThreadName);
delete currentThreadName;
}
if (-1 == maskValues[0]) {
InitializeMaskValues();
}
@@ -115,7 +100,8 @@ void DocumentLoaderObserverImpl::InitializeMaskValues()
return;
}
jclass documentLoadEventClass = env->FindClass("org/mozilla/webclient/DocumentLoadEvent");
jclass documentLoadEventClass = ::util_FindClass(env,
"org/mozilla/webclient/DocumentLoadEvent");
if (nsnull == documentLoadEventClass) {
return;
@@ -125,14 +111,15 @@ void DocumentLoaderObserverImpl::InitializeMaskValues()
jfieldID fieldID;
while (nsnull != maskNames[i]) {
fieldID = env->GetStaticFieldID(documentLoadEventClass, maskNames[i],
"J");
fieldID = ::util_GetStaticFieldID(env, documentLoadEventClass,
maskNames[i], "J");
if (nsnull == fieldID) {
return;
}
maskValues[i] = env->GetStaticLongField(documentLoadEventClass, fieldID);
maskValues[i] = ::util_GetStaticLongField(env, documentLoadEventClass,
fieldID);
i++;
}
}