Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved LiveConnect initialization calls to end of lm_ReallyInitMocha, so that the rest of libmocha will be initialized properly.

Browse Source
This commit is contained in:
beard%netscape.com 1998-09-28 22:59:08 +00:00
parent 26692e6416
commit f75844e8d8
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/libmocha/lm_init.c
View File

@ -729,21 +729,6 @@ lm_ReallyInitMocha(void)
crippled_decoder = lm_new_decoder(lm_runtime, &lm_dummy_class);
crippled_context = crippled_decoder->js_context;
#if defined(OJI)
if (JVM_MaybeStartupLiveConnect())
JSJ_InitJSContext(LM_GetCrippledContext(),
JS_GetGlobalObject(LM_GetCrippledContext()), NULL);
#elif defined(JAVA)
LJ_JSJ_Init();
/*
* Get liveconnect functions defined for the crippled context
* so we can pass error messages to the JavaConsole
*/
JSJ_InitContext(crippled_context, JS_GetGlobalObject(crippled_context));
#endif
/* Initialize a dummy object used for unreflectable applets and embeds. */
lm_DummyObject = crippled_decoder->window_object;
@ -774,6 +759,22 @@ lm_ReallyInitMocha(void)
lm_InitJSDebug(lm_runtime);
#endif
/* beard: move this to end, to ensure complete initialization before initing LiveConnect. */
#if defined(OJI)
if (JVM_MaybeStartupLiveConnect())
JSJ_InitJSContext(LM_GetCrippledContext(),
JS_GetGlobalObject(LM_GetCrippledContext()), NULL);
#elif defined(JAVA)
LJ_JSJ_Init();
/*
* Get liveconnect functions defined for the crippled context
* so we can pass error messages to the JavaConsole
*/
JSJ_InitContext(crippled_context, JS_GetGlobalObject(crippled_context));
#endif
return;
}