Refactor create_js_root_obj -> get_or_create_js_obj

Author: pandamicro

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

@@ -147,7 +147,7 @@ void register_all_cocos2dx_3d_manual(JSContext *cx, JS::HandleObject global)
     JS::RootedValue tmpVal(cx);
     JS::RootedObject ccObj(cx);
     JS::RootedObject tmpObj(cx);
-    create_js_root_obj(cx, global, "cc", &ccObj);
+    get_or_create_js_obj(cx, global, "cc", &ccObj);
 
     JS_GetProperty(cx, ccObj, "Sprite3D", &tmpVal);
     tmpObj = tmpVal.toObjectOrNull();

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

@@ -393,14 +393,17 @@ void registerDefaultClasses(JSContext* cx, JS::HandleObject global) {
     JS::RootedValue nsval(cx);
     JS::RootedObject ns(cx);
     JS_GetProperty(cx, global, "cc", &nsval);
-    ns = nsval.toObjectOrNull();
     // Not exist, create it
-    if (ns.get() == nullptr)
+    if (nsval == JSVAL_VOID)
     {
-        ns = JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr());
+        ns.set(JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr()));
         nsval = OBJECT_TO_JSVAL(ns);
         JS_SetProperty(cx, global, "cc", nsval);
     }
+    else
+    {
+        ns.set(nsval.toObjectOrNull());
+    }
 
     //
     // Javascript controller (__jsc__)

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

@@ -581,13 +581,13 @@ void JSPROXY_CCPhysicsSprite_createClass(JSContext *cx, JS::HandleObject globalO
 
 void register_CCPhysicsSprite(JSContext *cx, JS::HandleObject obj) {
     JS::RootedObject ccObj(cx);
-    create_js_root_obj(cx, obj, "cc", &ccObj);
+    get_or_create_js_obj(cx, obj, "cc", &ccObj);
     JSPROXY_CCPhysicsSprite_createClass(cx, ccObj);
 }
 
 void register_CCPhysicsDebugNode(JSContext *cx, JS::HandleObject obj) {
     JS::RootedObject ccObj(cx);
-    create_js_root_obj(cx, obj, "cc", &ccObj);
+    get_or_create_js_obj(cx, obj, "cc", &ccObj);
     JSB_CCPhysicsDebugNode_createClass(cx, ccObj, "PhysicsDebugNode");
 }
 

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

@@ -5139,18 +5139,16 @@ bool js_console_log(JSContext *cx, uint32_t argc, jsval *vp)
     return false;
 }
 
-void create_js_root_obj(JSContext* cx, JS::HandleObject obj, const std::string &name, JS::MutableHandleObject jsObj)
+void get_or_create_js_obj(JSContext* cx, JS::HandleObject obj, const std::string &name, JS::MutableHandleObject jsObj)
 {
     JS::RootedValue nsval(cx);
-    JS::RootedObject tmp(cx);
     JS_GetProperty(cx, obj, name.c_str(), &nsval);
-    tmp = nsval.toObjectOrNull();
-    if (!tmp.get()) {
+    if (nsval == JSVAL_VOID) {
         jsObj.set(JS_NewObject(cx, NULL, JS::NullPtr(), JS::NullPtr()));
         nsval = OBJECT_TO_JSVAL(jsObj);
         JS_SetProperty(cx, obj, name.c_str(), nsval);
     } else {
-        jsObj.set(tmp);
+        jsObj.set(nsval.toObjectOrNull());
     }
 }
 
@@ -5159,9 +5157,10 @@ void register_cocos2dx_js_core(JSContext* cx, JS::HandleObject global)
     JS::RootedObject ccObj(cx);
     JS::RootedValue tmpVal(cx);
     JS::RootedObject tmpObj(cx);
-    create_js_root_obj(cx, global, "cc", &ccObj);
+    get_or_create_js_obj(cx, global, "cc", &ccObj);
 
-    create_js_root_obj(cx, ccObj, "PlistParser", &tmpObj);
+    JS_GetProperty(cx, ccObj, "PlistParser", &tmpVal);
+    tmpObj = tmpVal.toObjectOrNull();
     JS_DefineFunction(cx, tmpObj, "getInstance", js_PlistParser_getInstance, 0, JSPROP_READONLY | JSPROP_PERMANENT);
     JS::RootedObject proto(cx, jsb_cocos2d_SAXParser_prototype);
     JS_DefineFunction(cx, proto, "parse", js_PlistParser_parse, 1, JSPROP_READONLY | JSPROP_PERMANENT);
@@ -5400,7 +5399,7 @@ void register_cocos2dx_js_core(JSContext* cx, JS::HandleObject global)
     JS_DefineFunction(cx, ccObj, "unregisterTouchDelegate", js_cocos2dx_JSTouchDelegate_unregisterTouchDelegate, 1, JSPROP_READONLY | JSPROP_PERMANENT);
 
     JS::RootedObject mathObj(cx);
-    create_js_root_obj(cx, ccObj, "math", &mathObj);
+    get_or_create_js_obj(cx, ccObj, "math", &mathObj);
     JS_DefineFunction(cx, mathObj, "obbGetCorners", js_cocos2dx_ccobbGetCorners, 1, JSPROP_READONLY | JSPROP_PERMANENT);
     JS_DefineFunction(cx, mathObj, "obbIntersectsObb", js_cocos2dx_ccobbIntersects, 1, JSPROP_READONLY | JSPROP_PERMANENT);
     JS_DefineFunction(cx, mathObj, "rayIntersectsObb", js_cocos2dx_ccrayIntersectsObb, 1, JSPROP_READONLY | JSPROP_PERMANENT);
@@ -5413,7 +5412,7 @@ void register_cocos2dx_js_core(JSContext* cx, JS::HandleObject global)
     js_register_cocos2dx_EventKeyboard(cx, ccObj);
 
     JS::RootedObject consoleObj(cx);
-    create_js_root_obj(cx, global, "console", &consoleObj);
+    get_or_create_js_obj(cx, global, "console", &consoleObj);
 
     JS_DefineFunction(cx, consoleObj, "log", js_console_log, 1, JSPROP_READONLY | JSPROP_PERMANENT);
 }

frameworks/js-bindings/bindings/manual/cocos2d_specifics.hpp

@@ -265,6 +265,6 @@ bool js_cocos2dx_Node_onExitTransitionDidStart(JSContext *cx, uint32_t argc, jsv
 bool js_cocos2dx_Component_onEnter(JSContext *cx, uint32_t argc, jsval *vp);
 bool js_cocos2dx_Component_onExit(JSContext *cx, uint32_t argc, jsval *vp);
 
-void create_js_root_obj(JSContext* cx, JS::HandleObject obj, const std::string &name, JS::MutableHandleObject jsObj);
+void get_or_create_js_obj(JSContext* cx, JS::HandleObject obj, const std::string &name, JS::MutableHandleObject jsObj);
 
 #endif

frameworks/js-bindings/bindings/manual/cocosbuilder/js_bindings_ccbreader.cpp

@@ -323,7 +323,7 @@ void register_CCBuilderReader(JSContext *cx, JS::HandleObject global)
     JS::RootedObject ccObj(cx);
     JS::RootedValue tmpVal(cx);
     JS::RootedObject tmpObj(cx);
-    create_js_root_obj(cx, global, "cc", &ccObj);
+    get_or_create_js_obj(cx, global, "cc", &ccObj);
 
     JS_GetProperty(cx, ccObj, "_Reader", &tmpVal);
     tmpObj = tmpVal.toObjectOrNull();

frameworks/js-bindings/bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp

@@ -1041,7 +1041,7 @@ void register_all_cocos2dx_extension_manual(JSContext* cx, JS::HandleObject glob
     JS::RootedObject ccObj(cx);
     JS::RootedValue tmpVal(cx);
     JS::RootedObject tmpObj(cx);
-    create_js_root_obj(cx, global, "cc", &ccObj);
+    get_or_create_js_obj(cx, global, "cc", &ccObj);
 
     JS::RootedObject am(cx, jsb_cocos2d_extension_AssetsManagerEx_prototype); 
     JS_DefineFunction(cx, am, "retain", js_cocos2dx_ext_retain, 0, JSPROP_ENUMERATE | JSPROP_PERMANENT);
@@ -1067,7 +1067,7 @@ void register_all_cocos2dx_extension_manual(JSContext* cx, JS::HandleObject glob
     JS_DefineFunction(cx, tmpObj, "create", js_cocos2dx_CCTableView_create, 3, JSPROP_READONLY | JSPROP_PERMANENT);
 
     JS::RootedObject jsbObj(cx);
-    create_js_root_obj(cx, global, "jsb", &jsbObj);
+    get_or_create_js_obj(cx, global, "cc", &jsbObj);
 
     JS_DefineFunction(cx, jsbObj, "loadRemoteImg", js_load_remote_image, 2, JSPROP_READONLY | JSPROP_PERMANENT);
 }

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

@@ -45,7 +45,7 @@ void JSB_register_opengl(JSContext *_cx, JS::HandleObject object)
     JS_SetProperty(_cx, object, "gl", openglVal);
 
     JS::RootedObject ccns(_cx);
-    create_js_root_obj(_cx, object, "cc", &ccns);
+    get_or_create_js_obj(_cx, object, "cc", &ccns);
 
     js_register_cocos2dx_GLNode(_cx, ccns);
 

samples/js-tests/project/Classes/js_DrawNode3D_bindings.cpp

@@ -588,6 +588,6 @@ void js_register_cocos2dx_DrawNode3D(JSContext *cx, JS::HandleObject global) {
 void register_DrawNode3D_bindings(JSContext *cx, JS::HandleObject global)
 {
     JS::RootedObject ccobj(cx);
-    create_js_root_obj(cx, global, "cc", &ccobj);
+    get_or_create_js_obj(cx, global, "cc", &ccobj);
     js_register_cocos2dx_DrawNode3D(cx, ccobj);
 }

samples/js-tests/project/Classes/js_Effect3D_bindings.cpp

@@ -771,7 +771,7 @@ void js_register_cocos2dx_EffectSprite3D(JSContext *cx, JS::HandleObject global)
 void register_Effect3D_bindings(JSContext *cx, JS::HandleObject global)
 {
     JS::RootedObject ccobj(cx);
-    create_js_root_obj(cx, global, "cc", &ccobj);
+    get_or_create_js_obj(cx, global, "cc", &ccobj);
     js_register_cocos2dx_Effect3DOutline(cx, ccobj);
     js_register_cocos2dx_EffectSprite3D(cx, ccobj);
 }