Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1476 from dumganhar/gles20 

Made TestJavascript and MoonWarriors work ok on android after merging Rolando's commit.
This commit is contained in:
James Chen 2012-10-19 00:28:24 -07:00
parent fe019b913d 871541ac6b
commit 677df5ffd5
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripting/javascript/bindings/ScriptingCore.cpp
View File

@ -361,6 +361,8 @@ JSBool ScriptingCore::evalString(const char *string, jsval *outVal, const char *
JSScript* script = JS_CompileScript(cx, global, string, strlen(string), filename, 1);
if (script) {
// JSAutoCompartment ac(cx, global);
JSAutoEnterCompartment ac;
ac.enter(cx, global);
JSBool evaluatedOK = JS_ExecuteScript(cx_, global_, script, &rval);
if (JS_FALSE == evaluatedOK) {
fprintf(stderr, "(evaluatedOK == JS_FALSE)\n");
@ -437,12 +439,23 @@ JSBool ScriptingCore::runScript(const char *path, JSObject* global, JSContext* c
}
// this will always compile the script, we can actually check if the script
// was compiled before, because it can be in the global map
JSScript* script = JS_CompileUTF8File(cx, global, rpath.c_str());
// We can't use this function on android since all the sources are packed into apk file.
// JSScript* script = JS_CompileUTF8File(cx, global, rpath.c_str());
unsigned char *content = NULL;
unsigned long contentSize = 0;
content = (unsigned char*)CCString::createWithContentsOfFile(rpath.c_str())->getCString();
contentSize = strlen((char*)content);
JSScript* script = JS_CompileScript(cx, global, (char*)content, contentSize, "noname", 1);
JSBool evaluatedOK = false;
if (script) {
jsval rval;
filename_script[path] = script;
// JSAutoCompartment ac(cx, global);
JSAutoEnterCompartment ac;
ac.enter(cx, global);
evaluatedOK = JS_ExecuteScript(cx, global, script, &rval);
if (JS_FALSE == evaluatedOK) {
fprintf(stderr, "(evaluatedOK == JS_FALSE)\n");
@ -1106,6 +1119,8 @@ JSObject* NewGlobalObject(JSContext* cx)
return NULL;
}
//JSAutoCompartment ac(cx, glob);
JSAutoEnterCompartment ac;
ac.enter(cx, glob);
if (!JS_InitStandardClasses(cx, glob))
return NULL;
if (!JS_InitReflect(cx, glob))