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

added GetJVMContext() to map_jsj_thread_to_js_context_impl() to get JSContext associated with a call back from Java. Using nsIPluginInstancePeer::GetJSWindow() to return global JSObject for each browser window.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24976 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com 1999-03-24 05:49:05 +00:00
parent 849bde491e
commit 888b433ccb
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/modules/oji/src/lcglue.cpp
View File

@ -129,6 +129,9 @@ PR_BEGIN_EXTERN_C
static JSContext* PR_CALLBACK
map_jsj_thread_to_js_context_impl(JSJavaThreadState *jsj_env, JNIEnv *env, char **errp)
{
JVMContext* context = GetJVMContext();
JSContext *cx = context->js_context;
/*
** This callback is called for spontaneous calls only. Either create a new JSContext
** or return the crippled context.
@ -136,7 +139,7 @@ map_jsj_thread_to_js_context_impl(JSJavaThreadState *jsj_env, JNIEnv *env, char
** and then to get to the native context.
*/
//JSContext *cx = LM_GetCrippledContext();
JSContext *cx = NULL;
//JSContext *cx = NULL;
*errp = NULL;
return cx;
@ -227,17 +230,17 @@ map_java_object_to_js_object_impl(JNIEnv *env, void *pluginInstancePtr, char* *e
nsIJVMPluginTagInfo* tagInfo;
if (pluginPeer->QueryInterface(kIJVMPluginTagInfoIID, (void**) &tagInfo) == NS_OK) {
err = tagInfo->GetMayScript(&mayscript);
PR_ASSERT(err != NS_OK ? mayscript == PR_FALSE : PR_TRUE);
// PR_ASSERT(err != NS_OK ? mayscript == PR_FALSE : PR_TRUE);
NS_RELEASE(tagInfo);
}
if ( !mayscript ) {
*errp = strdup("JSObject.getWindow() requires mayscript attribute on this Applet");
} else {
err = pluginPeer->GetJSWindow(&window);
}
NS_RELEASE(pluginPeer);
}
if ( !mayscript ) {
*errp = strdup("JSObject.getWindow() requires mayscript attribute on this Applet");
return NULL;
}
//TODO: Get to the window object using DOM.
// window = getDOMWindow().getScriptOwner().getJSObject().
return window;