Merge pull request cocos2d#1577 from pandamicro/develop

Reverse SpiderMonkey iOS build to v33

Author: pandamicro

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

@@ -593,19 +593,14 @@ void ScriptingCore::createGlobalContext() {
 #if defined(JS_GC_ZEAL) && defined(DEBUG)
     //JS_SetGCZeal(this->_cx, 2, JS_DEFAULT_ZEAL_FREQ);
 #endif
-#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;
@@ -1754,20 +1749,13 @@ 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

frameworks/js-bindings/external/spidermonkey/include/ios/js-config-32.h

@@ -47,7 +47,7 @@
 /* #undef JS_PUNBOX64 */
 
 /* MOZILLA JSAPI version number components */
-#define MOZJS_MAJOR_VERSION 34
-#define MOZJS_MINOR_VERSION 0
+#define MOZJS_MAJOR_VERSION 33
+#define MOZJS_MINOR_VERSION 1
 
 #endif /* js_config_h */

frameworks/js-bindings/external/spidermonkey/include/ios/js-config-64.h

@@ -47,7 +47,7 @@
 #define JS_PUNBOX64 1
 
 /* MOZILLA JSAPI version number components */
-#define MOZJS_MAJOR_VERSION 34
-#define MOZJS_MINOR_VERSION 0
+#define MOZJS_MAJOR_VERSION 33
+#define MOZJS_MINOR_VERSION 1
 
 #endif /* js_config_h */

frameworks/js-bindings/external/spidermonkey/include/ios/js.msg

@@ -362,13 +362,6 @@ class MOZ_STACK_CLASS CallArgs : public detail::CallArgsBase<detail::IncludeUsed
         return args;
     }
 
-  public:
-    /*
-     * Returns true if there are at least |required| arguments passed in. If
-     * false, it reports an error message on the context.
-     */
-    bool requireAtLeast(JSContext *cx, const char *fnname, unsigned required);
-
 };
 
 MOZ_ALWAYS_INLINE CallArgs

frameworks/js-bindings/external/spidermonkey/include/ios/js/CallArgs.h

@@ -522,9 +522,8 @@ Valueify(const JSClass *c)
  * value of objects.
  */
 enum ESClassValue {
-    ESClass_Object, ESClass_Array, ESClass_Number, ESClass_String,
-    ESClass_Boolean, ESClass_RegExp, ESClass_ArrayBuffer, ESClass_Date,
-    ESClass_Set, ESClass_Map
+    ESClass_Array, ESClass_Number, ESClass_String, ESClass_Boolean,
+    ESClass_RegExp, ESClass_ArrayBuffer, ESClass_Date
 };
 
 /*
@@ -540,10 +539,6 @@ ObjectClassIs(JSObject &obj, ESClassValue classValue, JSContext *cx);
 inline bool
 IsObjectWithClass(const JS::Value &v, ESClassValue classValue, JSContext *cx);
 
-/* Fills |vp| with the unboxed value for boxed types, or undefined otherwise. */
-inline bool
-Unbox(JSContext *cx, JS::HandleObject obj, JS::MutableHandleValue vp);
-
 }  /* namespace js */
 
 #endif  /* js_Class_h */