wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 921548 - Remove js_ValueToNonNullObject, which was entirely equivalent to ToObject. r=jorendorff

Browse Source
This commit is contained in:
Jeff Walden 2013-09-27 11:19:47 -07:00
parent aa5662e285
commit fa99ea9de0
5 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/builtin/MapObject.cpp
View File

@ -1175,7 +1175,7 @@ MapObject::construct(JSContext *cx, unsigned argc, Value *vp)
if (args.hasDefined(0)) {
ForOfIterator iter(cx, args[0]);
while (iter.next()) {
RootedObject pairobj(cx, js_ValueToNonNullObject(cx, iter.value()));
RootedObject pairobj(cx, ToObject(cx, iter.value()));
if (!pairobj)
return false;

2
js/src/jsiter.cpp
View File

@ -985,7 +985,7 @@ js::ValueToIterator(JSContext *cx, unsigned flags, MutableHandleValue vp)
return false;
/* fall through */
} else {
obj = js_ValueToNonNullObject(cx, vp);
obj = ToObject(cx, vp);
if (!obj)
return false;
}

14
js/src/jsobj.cpp
View File

@ -5185,20 +5185,6 @@ js::ToObjectSlow(JSContext *cx, HandleValue val, bool reportScanStack)
return PrimitiveToObject(cx, val);
}
JSObject *
js_ValueToNonNullObject(JSContext *cx, const Value &v)
{
RootedObject obj(cx);
if (!js_ValueToObjectOrNull(cx, v, &obj))
return NULL;
if (!obj) {
RootedValue val(cx, v);
js_ReportIsNullOrUndefined(cx, JSDVG_SEARCH_STACK, val, NullPtr());
}
return obj;
}
void
js_GetObjectSlotName(JSTracer *trc, char *buf, size_t bufsize)
{

4
js/src/jsobj.h
View File

@ -1468,10 +1468,6 @@ PrimitiveToObject(JSContext *cx, const Value &v);
extern bool
js_ValueToObjectOrNull(JSContext *cx, const js::Value &v, JS::MutableHandleObject objp);
/* Throws if v could not be converted to an object. */
extern JSObject *
js_ValueToNonNullObject(JSContext *cx, const js::Value &v);
namespace js {
/*

2
js/src/vm/Interpreter.cpp
View File

@ -819,7 +819,7 @@ EnterWith(JSContext *cx, AbstractFramePtr frame, HandleValue val, uint32_t stack
if (val.isObject()) {
obj = &val.toObject();
} else {
obj = js_ValueToNonNullObject(cx, val);
obj = ToObject(cx, val);
if (!obj)
return false;
}