mirror of
https://github.com/rkd77/elinks.git
synced 2024-12-04 14:46:47 -05:00
Make global_object a global with the new name smjs_global_object and
create smjs_init_global_object to initialise the global.
This commit is contained in:
parent
3174c533b0
commit
d6ecf895ce
@ -98,8 +98,6 @@ smjs_load_hooks(void)
|
|||||||
void
|
void
|
||||||
init_smjs(struct module *module)
|
init_smjs(struct module *module)
|
||||||
{
|
{
|
||||||
JSObject *global_object;
|
|
||||||
|
|
||||||
smjs_rt = JS_NewRuntime(1L * 1024L * 1024L);
|
smjs_rt = JS_NewRuntime(1L * 1024L * 1024L);
|
||||||
if (!smjs_rt) return;
|
if (!smjs_rt) return;
|
||||||
|
|
||||||
@ -112,9 +110,9 @@ init_smjs(struct module *module)
|
|||||||
|
|
||||||
JS_SetErrorReporter(smjs_ctx, error_reporter);
|
JS_SetErrorReporter(smjs_ctx, error_reporter);
|
||||||
|
|
||||||
global_object = smjs_get_global_object();
|
smjs_init_global_object();
|
||||||
|
|
||||||
smjs_elinks_object = smjs_get_elinks_object(global_object);
|
smjs_elinks_object = smjs_get_elinks_object(smjs_global_object);
|
||||||
|
|
||||||
smjs_load_hooks();
|
smjs_load_hooks();
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ static const JSClass global_class = {
|
|||||||
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
|
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
|
||||||
};
|
};
|
||||||
|
|
||||||
JSObject *
|
static JSObject *
|
||||||
smjs_get_global_object(void)
|
smjs_get_global_object(void)
|
||||||
{
|
{
|
||||||
JSObject *jsobj;
|
JSObject *jsobj;
|
||||||
@ -37,3 +37,9 @@ smjs_get_global_object(void)
|
|||||||
|
|
||||||
return jsobj;
|
return jsobj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
smjs_init_global_object(void)
|
||||||
|
{
|
||||||
|
smjs_global_object = smjs_get_global_object();
|
||||||
|
}
|
||||||
|
@ -3,6 +3,11 @@
|
|||||||
|
|
||||||
#include "ecmascript/spidermonkey/util.h"
|
#include "ecmascript/spidermonkey/util.h"
|
||||||
|
|
||||||
JSObject *smjs_get_global_object(void);
|
/* The root of the object hierarchy. If object 'foo' has this as its parent,
|
||||||
|
* you can use foo's method and properties with 'foo.<method|property>'. */
|
||||||
|
extern JSObject *smjs_global_object;
|
||||||
|
|
||||||
|
/* Create the global object and assign it to smjs_global_object. */
|
||||||
|
void smjs_init_global_object(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user