From 83cc868202e839188a1c8a41ef25711bb8008b19 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Mon, 20 Jan 2014 08:58:27 +0100
Subject: [PATCH] Bug 956553 - Remove js::IdToJsval in favour of js::IdToValue;
 r=luke

---
 js/src/builtin/TypedObject.cpp   | 2 +-
 js/src/jsapi.cpp                 | 2 +-
 js/src/jsfriendapi.h             | 6 ------
 js/src/vm/OldDebugAPI.cpp        | 2 +-
 js/xpconnect/src/XPCQuickStubs.h | 2 +-
 5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/js/src/builtin/TypedObject.cpp b/js/src/builtin/TypedObject.cpp
index dcd8a5b03e52..426bc8aea998 100644
--- a/js/src/builtin/TypedObject.cpp
+++ b/js/src/builtin/TypedObject.cpp
@@ -898,7 +898,7 @@ StructType::layout(JSContext *cx, HandleObject structType, HandleObject fields)
         // Check that all the property names are non-numeric strings.
         uint32_t unused;
         if (!JSID_IS_ATOM(id) || JSID_TO_ATOM(id)->isIndex(&unused)) {
-            RootedValue idValue(cx, IdToJsval(id));
+            RootedValue idValue(cx, IdToValue(id));
             ReportCannotConvertTo(cx, idValue, "StructType field name");
             return false;
         }
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 656081742f13..9b473eeef180 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -2239,7 +2239,7 @@ JS_IdToValue(JSContext *cx, jsid id, MutableHandleValue vp)
 {
     AssertHeapIsIdle(cx);
     CHECK_REQUEST(cx);
-    vp.set(IdToJsval(id));
+    vp.set(IdToValue(id));
     assertSameCompartment(cx, vp);
     return true;
 }
diff --git a/js/src/jsfriendapi.h b/js/src/jsfriendapi.h
index f2b3599531ee..07bf263958bb 100644
--- a/js/src/jsfriendapi.h
+++ b/js/src/jsfriendapi.h
@@ -1766,12 +1766,6 @@ IdToValue(jsid id)
     return JS::UndefinedValue();
 }
 
-static JS_ALWAYS_INLINE jsval
-IdToJsval(jsid id)
-{
-    return IdToValue(id);
-}
-
 extern JS_FRIEND_API(bool)
 IsReadOnlyDateMethod(JS::IsAcceptableThis test, JS::NativeImpl method);
 
diff --git a/js/src/vm/OldDebugAPI.cpp b/js/src/vm/OldDebugAPI.cpp
index e56f0493c06c..8dd2a2c539ab 100644
--- a/js/src/vm/OldDebugAPI.cpp
+++ b/js/src/vm/OldDebugAPI.cpp
@@ -627,7 +627,7 @@ static bool
 GetPropertyDesc(JSContext *cx, JSObject *obj_, HandleShape shape, JSPropertyDesc *pd)
 {
     assertSameCompartment(cx, obj_);
-    pd->id = IdToJsval(shape->propid());
+    pd->id = IdToValue(shape->propid());
 
     RootedObject obj(cx, obj_);
 
diff --git a/js/xpconnect/src/XPCQuickStubs.h b/js/xpconnect/src/XPCQuickStubs.h
index 1913b0ecb652..3abf6e9a8425 100644
--- a/js/xpconnect/src/XPCQuickStubs.h
+++ b/js/xpconnect/src/XPCQuickStubs.h
@@ -643,7 +643,7 @@ GeneratePropertyOp(JSContext *cx, JS::HandleObject obj, JS::HandleId id, unsigne
     JS_SetPrivate(ptrobj, popp);
 
     js::SetFunctionNativeReserved(funobj, 0, OBJECT_TO_JSVAL(ptrobj));
-    js::SetFunctionNativeReserved(funobj, 1, js::IdToJsval(id));
+    js::SetFunctionNativeReserved(funobj, 1, js::IdToValue(id));
     return funobj;
 }