Bug 952650 (part 10) - Remove JSVAL_IS_NUMBER. r=njn.

--HG--
extra : rebase_source : eaef4276d665c9bb06eb695989fb4c3b08358069

js/jsd/jsd_val.cpp

@@ -66,7 +66,7 @@ jsd_IsValueObject(JSDContext* jsdc, JSDValue* jsdval)
 bool
 jsd_IsValueNumber(JSDContext* jsdc, JSDValue* jsdval)
 {
-    return JSVAL_IS_NUMBER(jsdval->val);
+    return jsdval->val.isNumber();
 }
 
 bool

js/public/Value.h

@@ -1865,12 +1865,6 @@ UINT_TO_JSVAL(uint32_t i)
             : DOUBLE_TO_JSVAL((double)i));
 }
 
-static inline bool
-JSVAL_IS_NUMBER(jsval v)
-{
-    return JSVAL_IS_NUMBER_IMPL(JSVAL_TO_IMPL(v));
-}
-
 static inline jsval
 STRING_TO_JSVAL(JSString *str)
 {

js/src/tests/js1_5/Regress/regress-407024.js

@@ -5,7 +5,7 @@
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 407024;
-var summary = 'Do not assert JSVAL_IS_NUMBER(pn3->pn_val) || pn3->pn_val.isString() || pn3->pn_val.isBoolean()';
+var summary = 'Do not assert pn3->pn_val.isNumber() || pn3->pn_val.isString() || pn3->pn_val.isBoolean()';
 var actual = 'No Crash';
 var expect = 'No Crash';
 

js/xpconnect/src/XPCConvert.cpp

@@ -1216,7 +1216,7 @@ XPCConvert::JSValToXPCException(MutableHandleValue s,
                                   exceptn, cx, s.address());
     }
 
-    if (JSVAL_IS_NUMBER(s)) {
+    if (s.isNumber()) {
         // lets see if it looks like an nsresult
         nsresult rv;
         double number;

js/xpconnect/src/XPCWrappedJSClass.cpp

@@ -241,7 +241,7 @@ nsXPCWrappedJSClass::CallQueryInterfaceOnJSObject(JSContext* cx,
                         rv == NS_NOINTERFACE) {
                         JS_ClearPendingException(cx);
                     }
-                } else if (JSVAL_IS_NUMBER(jsexception)) {
+                } else if (jsexception.isNumber()) {
                     // JS often throws an nsresult.
                     if (jsexception.isDouble())
                         // Visual Studio 9 doesn't allow casting directly from

toolkit/components/places/History.cpp

@@ -391,7 +391,7 @@ GetIntFromJSObject(JSContext* aCtx,
     return NS_ERROR_INVALID_ARG;
   }
   NS_ENSURE_ARG(JSVAL_IS_PRIMITIVE(value));
-  NS_ENSURE_ARG(JSVAL_IS_NUMBER(value));
+  NS_ENSURE_ARG(value.isNumber());
 
   double num;
   rc = JS::ToNumber(aCtx, value, &num);