Merge pull request #1560 from pandamicro/ImproveBindings

Improve bindings and upgrade to SpiderMonkey v34 for iOS

Author: pandamicro

frameworks/js-bindings/bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp

@@ -144,8 +144,13 @@ bool js_cocos2dx_Mesh_getMeshVertexAttribute(JSContext *cx, uint32_t argc, jsval
 
 void register_all_cocos2dx_3d_manual(JSContext *cx, JS::HandleObject global)
 {
+    JS::RootedValue tmpVal(cx);
+    JS::RootedObject ccObj(cx);
     JS::RootedObject tmpObj(cx);
-    tmpObj = anonEvaluate(cx, global, "(function () { return cc.Sprite3D; })()").toObjectOrNull();
+    get_or_create_js_obj(cx, global, "cc", &ccObj);
+    
+    JS_GetProperty(cx, ccObj, "Sprite3D", &tmpVal);
+    tmpObj = tmpVal.toObjectOrNull();
     JS_DefineFunction(cx, tmpObj, "createAsync", js_cocos2dx_Sprite3D_createAsync, 4, JSPROP_READONLY | JSPROP_PERMANENT);
 
     JS_DefineFunction(cx, JS::RootedObject(cx, jsb_cocos2d_Sprite3D_prototype), "getAABB", js_cocos2dx_Sprite3D_getAABB, 0, JSPROP_READONLY | JSPROP_PERMANENT);

frameworks/js-bindings/bindings/manual/ScriptingCore.cpp

@@ -393,14 +393,16 @@ void registerDefaultClasses(JSContext* cx, JS::HandleObject global) {
     JS::RootedValue nsval(cx);
     JS::RootedObject ns(cx);
     JS_GetProperty(cx, global, "cc", &nsval);
-    if (nsval == JSVAL_VOID) {
-        JS::RootedObject proto(cx);
-        JS::RootedObject parent(cx);
-        ns = JS_NewObject(cx, NULL, proto, parent);
+    // Not exist, create it
+    if (nsval == JSVAL_VOID)
+    {
+        ns.set(JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr()));
         nsval = OBJECT_TO_JSVAL(ns);
         JS_SetProperty(cx, global, "cc", nsval);
-    } else {
-        JS_ValueToObject(cx, nsval, &ns);
+    }
+    else
+    {
+        ns.set(nsval.toObjectOrNull());
     }
 
     //
@@ -554,12 +556,12 @@ static JSSecurityCallbacks securityCallbacks = {
 };
 
 void ScriptingCore::createGlobalContext() {
-    if (this->_cx && this->_rt) {
-        ScriptingCore::removeAllRoots(this->_cx);
-        JS_DestroyContext(this->_cx);
-        JS_DestroyRuntime(this->_rt);
-        this->_cx = NULL;
-        this->_rt = NULL;
+    if (_cx && _rt) {
+        ScriptingCore::removeAllRoots(_cx);
+        JS_DestroyContext(_cx);
+        JS_DestroyRuntime(_rt);
+        _cx = NULL;
+        _rt = NULL;
     }
 
     // Start the engine. Added in SpiderMonkey v25
@@ -568,40 +570,46 @@ void ScriptingCore::createGlobalContext() {
 
     // Removed from Spidermonkey 19.
     //JS_SetCStringsAreUTF8();
-    this->_rt = JS_NewRuntime(8L * 1024L * 1024L);
+    _rt = JS_NewRuntime(8L * 1024L * 1024L);
     JS_SetGCParameter(_rt, JSGC_MAX_BYTES, 0xffffffff);
 
     JS_SetTrustedPrincipals(_rt, &shellTrustedPrincipals);
     JS_SetSecurityCallbacks(_rt, &securityCallbacks);
     JS_SetNativeStackQuota(_rt, JSB_MAX_STACK_QUOTA);
 
-    this->_cx = JS_NewContext(_rt, 8192);
+    _cx = JS_NewContext(_rt, 8192);
 
     // Removed in Firefox v27
 //    JS_SetOptions(this->_cx, JSOPTION_TYPE_INFERENCE);
     // Removed in Firefox v33
 //    JS::ContextOptionsRef(_cx).setTypeInference(true);
-//    JS::ContextOptionsRef(_cx).setIon(true);
-//    JS::ContextOptionsRef(_cx).setBaseline(true);
 
     JS::RuntimeOptionsRef(_rt).setIon(true);
     JS::RuntimeOptionsRef(_rt).setBaseline(true);
 
 //    JS_SetVersion(this->_cx, JSVERSION_LATEST);
 
-    JS_SetErrorReporter(this->_cx, ScriptingCore::reportError);
+    JS_SetErrorReporter(_cx, ScriptingCore::reportError);
 #if defined(JS_GC_ZEAL) && defined(DEBUG)
     //JS_SetGCZeal(this->_cx, 2, JS_DEFAULT_ZEAL_FREQ);
 #endif
-    this->_global.construct(_cx);
-    this->_global.ref() = NewGlobalObject(_cx);
-
-    JSAutoCompartment ac(_cx, _global.ref().get());
-    js::SetDefaultObjectForContext(_cx, _global.ref().get());
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+    _global.emplace(_cx);
+#else
+    _global.construct(_cx);
+#endif
+    _global.ref() = NewGlobalObject(_cx);
+    
+    JSAutoCompartment ac(_cx, _global.ref());
+    
+#if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS)
+    // Removed in Firefox v34
+    js::SetDefaultObjectForContext(_cx, _global.ref());
+#endif
 
     for (std::vector<sc_register_sth>::iterator it = registrationList.begin(); it != registrationList.end(); it++) {
         sc_register_sth callback = *it;
-        callback(this->_cx, JS::RootedObject(this->_cx, this->_global.ref().get()));
+        callback(_cx, _global.ref());
     }
 }
 
@@ -727,8 +735,7 @@ void ScriptingCore::cleanAllScript()
 
 bool ScriptingCore::runScript(const char *path)
 {
-    JS::RootedObject global(_cx, _global.ref().get());
-    return runScript(path, global, _cx);
+    return runScript(path, _global.ref(), _cx);
 }
 
 bool ScriptingCore::runScript(const char *path, JS::HandleObject global, JSContext* cx)
@@ -1747,13 +1754,20 @@ bool JSBDebug_BufferWrite(JSContext* cx, unsigned argc, jsval* vp)
 
 void ScriptingCore::enableDebugger(unsigned int port)
 {
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+    if (_debugGlobal.isNothing())
+#else
     if (_debugGlobal.empty())
+#endif
     {
         JSAutoCompartment ac0(_cx, _global.ref().get());
 
         JS_SetDebugMode(_cx, true);
-        
+#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
+        _debugGlobal.emplace(_cx);
+#else
         _debugGlobal.construct(_cx);
+#endif
         _debugGlobal.ref() = NewGlobalObject(_cx, true);
         // Adds the debugger object to root, otherwise it may be collected by GC.
         //AddObjectRoot(_cx, &_debugGlobal); no need, it's persistent rooted now
@@ -1781,7 +1795,7 @@ void ScriptingCore::enableDebugger(unsigned int port)
         // start bg thread
         auto t = std::thread(&serverEntryPoint,port);
         t.detach();
-
+        
         Scheduler* scheduler = Director::getInstance()->getScheduler();
         scheduler->scheduleUpdate(this->_runLoop, 0, false);
     }

frameworks/js-bindings/bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp

@@ -25,6 +25,7 @@
 #include "jsfriendapi.h"
 #include "extensions/cocos-ext.h"
 #include "js_bindings_config.h"
+#include "cocos2d_specifics.hpp"
 #ifdef JSB_INCLUDE_CHIPMUNK
 
 #include "js_bindings_chipmunk_manual.h"
@@ -581,33 +582,15 @@ void JSPROXY_CCPhysicsSprite_createClass(JSContext *cx, JS::HandleObject globalO
 
 
 void register_CCPhysicsSprite(JSContext *cx, JS::HandleObject obj) {
-    JS::RootedValue nsval(cx);
-    JS::RootedObject ns(cx);
-    JS_GetProperty(cx, obj, "cc", &nsval);
-    if (nsval == JSVAL_VOID) {
-        ns = JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr());
-        nsval = OBJECT_TO_JSVAL(ns);
-        JS_SetProperty(cx, obj, "cc", nsval);
-    } else {
-        JS_ValueToObject(cx, nsval, &ns);
-    }
-    //obj = ns;
-    JSPROXY_CCPhysicsSprite_createClass(cx, ns);
+    JS::RootedObject ccObj(cx);
+    get_or_create_js_obj(cx, obj, "cc", &ccObj);
+    JSPROXY_CCPhysicsSprite_createClass(cx, ccObj);
 }
 
 void register_CCPhysicsDebugNode(JSContext *cx, JS::HandleObject obj) {
-    JS::RootedValue nsval(cx);
-    JS::RootedObject ns(cx);
-    JS_GetProperty(cx, obj, "cc", &nsval);
-    if (nsval == JSVAL_VOID) {
-        ns = JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr());
-        nsval = OBJECT_TO_JSVAL(ns);
-        JS_SetProperty(cx, obj, "cc", nsval);
-    } else {
-        JS_ValueToObject(cx, nsval, &ns);
-    }
-    //obj = ns;
-    JSB_CCPhysicsDebugNode_createClass(cx, ns, "PhysicsDebugNode");
+    JS::RootedObject ccObj(cx);
+    get_or_create_js_obj(cx, obj, "cc", &ccObj);
+    JSB_CCPhysicsDebugNode_createClass(cx, ccObj, "PhysicsDebugNode");
 }
 
 bool jsval_to_cpBB( JSContext *cx, jsval vp, cpBB *ret )