back out 3a8893b28489 (bug 712939) and 39adab158c17,16add78c43e3,37193db7e15b (bug 712873), for build bustage.

This commit is contained in:
Daniel Holbert
2014-02-19 00:15:51 -08:00
parent 7e12e52dd2
commit 89c63da190
36 changed files with 261 additions and 265 deletions

View File

@@ -180,7 +180,7 @@ JavaScriptShared::toVariant(JSContext *cx, JS::HandleValue from, JSVariant *to)
{
RootedObject obj(cx, from.toObjectOrNull());
if (!obj) {
MOZ_ASSERT(from == JSVAL_NULL);
JS_ASSERT(from == JSVAL_NULL);
*to = uint64_t(0);
return true;
}