Bug 1206168 - Rename JS_DefaultValue to JS::ToPrimitive. r=jandem.

--HG--
extra : commitid : 4nCMAna0EKm
extra : rebase_source : b3590ed380216e2c1202b3773e7894702dc19a9e

dom/plugins/base/nsJSNPRuntime.cpp

@@ -2297,14 +2297,14 @@ NPObjectMember_toPrimitive(JSContext *cx, unsigned argc, JS::Value *vp)
   if (!memberPrivate)
     return false;
 
-  JSType type;
+  JSType hint;
-  if (!JS::GetFirstArgumentAsTypeHint(cx, args, &type))
+  if (!JS::GetFirstArgumentAsTypeHint(cx, args, &hint))
     return false;
 
   args.rval().set(memberPrivate->fieldValue);
   if (args.rval().isObject()) {
     JS::Rooted<JSObject*> objVal(cx, &args.rval().toObject());
-    return JS_DefaultValue(cx, objVal, type, args.rval());
+    return JS::ToPrimitive(cx, objVal, hint, args.rval());
   }
   return true;
 }

js/src/jsapi.cpp

@@ -1803,7 +1803,7 @@ JS_IdToValue(JSContext* cx, jsid id, MutableHandleValue vp)
 }
 
 JS_PUBLIC_API(bool)
-JS_DefaultValue(JSContext* cx, HandleObject obj, JSType hint, MutableHandleValue vp)
+JS::ToPrimitive(JSContext* cx, HandleObject obj, JSType hint, MutableHandleValue vp)
 {
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);

js/src/jsapi.h

@@ -1886,6 +1886,8 @@ JS_StringToId(JSContext* cx, JS::HandleString s, JS::MutableHandleId idp);
 extern JS_PUBLIC_API(bool)
 JS_IdToValue(JSContext* cx, jsid id, JS::MutableHandle<JS::Value> vp);
 
+namespace JS {
+
 /**
  * Convert obj to a primitive value. On success, store the result in vp and
  * return true.
@@ -1896,10 +1898,7 @@ JS_IdToValue(JSContext* cx, jsid id, JS::MutableHandle<JS::Value> vp);
  * Implements: ES6 7.1.1 ToPrimitive(input, [PreferredType]).
  */
 extern JS_PUBLIC_API(bool)
-JS_DefaultValue(JSContext* cx, JS::HandleObject obj, JSType hint,
+ToPrimitive(JSContext* cx, JS::HandleObject obj, JSType hint, JS::MutableHandleValue vp);
-                JS::MutableHandleValue vp);
-
-namespace JS {
 
 /**
  * If args.get(0) is one of the strings "string", "number", or "default", set