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

Upgrade spider monkey to solve win32 js project crash issue

This commit is contained in:
pandamicro 2015-12-14 10:27:11 +08:00
parent 1935e2a89b
commit 445442c964
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
View File

@ -1869,14 +1869,14 @@ void ScriptingCore::enableDebugger(unsigned int port)
} }
} }
JS::HandleObject NewGlobalObject(JSContext* cx, bool debug) JSObject* NewGlobalObject(JSContext* cx, bool debug)
{ {
JS::CompartmentOptions options; JS::CompartmentOptions options;
options.setVersion(JSVERSION_LATEST); options.setVersion(JSVERSION_LATEST);
JS::RootedObject glob(cx, JS_NewGlobalObject(cx, &global_class, &shellTrustedPrincipals, JS::DontFireOnNewGlobalHook, options)); JS::RootedObject glob(cx, JS_NewGlobalObject(cx, &global_class, &shellTrustedPrincipals, JS::DontFireOnNewGlobalHook, options));
if (!glob) { if (!glob) {
return JS::NullPtr(); return nullptr;
} }
JSAutoCompartment ac(cx, glob); JSAutoCompartment ac(cx, glob);
bool ok = true; bool ok = true;
@ -1886,7 +1886,7 @@ JS::HandleObject NewGlobalObject(JSContext* cx, bool debug)
if (ok && debug) if (ok && debug)
ok = JS_DefineDebuggerObject(cx, glob); ok = JS_DefineDebuggerObject(cx, glob);
if (!ok) if (!ok)
return JS::NullPtr(); return nullptr;
JS_FireOnNewGlobalObject(cx, glob); JS_FireOnNewGlobalObject(cx, glob);

2
cocos/scripting/js-bindings/manual/ScriptingCore.h
View File

@ -517,7 +517,7 @@ public:
void restartVM(); void restartVM();
}; };
JS::HandleObject NewGlobalObject(JSContext* cx, bool debug = false); JSObject* NewGlobalObject(JSContext* cx, bool debug = false);
bool jsb_set_reserved_slot(JSObject *obj, uint32_t idx, jsval value); bool jsb_set_reserved_slot(JSObject *obj, uint32_t idx, jsval value);
bool jsb_get_reserved_slot(JSObject *obj, uint32_t idx, jsval& ret); bool jsb_get_reserved_slot(JSObject *obj, uint32_t idx, jsval& ret);

4
external/config.json vendored
View File

@ -1,6 +1,6 @@
{ {
"version":"v3-deps-78", "version":"v3-deps-79",
"zip_file_size":"119277304", "zip_file_size":"124402591",
"repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_name":"cocos2d-x-3rd-party-libs-bin",
"repo_parent":"https://github.com/cocos2d/", "repo_parent":"https://github.com/cocos2d/",
"move_dirs":{ "move_dirs":{