corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 887009 - Pass MutableHandleValue to Invoke(); r=terrence

Browse Source
This commit is contained in:
Ms2ger
2013-07-01 09:03:13 +02:00
parent 2aec9f6523
commit fac32eafc7
16 changed files with 102 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsiter.cpp
View File

@@ -334,7 +334,7 @@ GetCustomIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandle
/* Otherwise call it and return that object. */
Value arg = BooleanValue((flags & JSITER_FOREACH) == 0);
if (!Invoke(cx, ObjectValue(*obj), vp, 1, &arg, vp.address()))
if (!Invoke(cx, ObjectValue(*obj), vp, 1, &arg, vp))
return false;
if (vp.isPrimitive()) {
/*
@@ -584,7 +584,7 @@ js::GetIterator(JSContext *cx, HandleObject obj, unsigned flags, MutableHandleVa
return false;
}
if (!Invoke(cx, ObjectOrNullValue(obj), method, 0, NULL, vp.address()))
if (!Invoke(cx, ObjectOrNullValue(obj), method, 0, NULL, vp))
return false;
JSObject *resultObj = ToObject(cx, vp);
@@ -1244,7 +1244,7 @@ js_IteratorMore(JSContext *cx, HandleObject iterobj, MutableHandleValue rval)
/* Call the iterator object's .next method. */
if (!JSObject::getProperty(cx, iterobj, iterobj, cx->names().next, rval))
return false;
if (!Invoke(cx, ObjectValue(*iterobj), rval, 0, NULL, rval.address())) {
if (!Invoke(cx, ObjectValue(*iterobj), rval, 0, NULL, rval)) {
/* Check for StopIteration. */
if (!cx->isExceptionPending() || !IsStopIteration(cx->getPendingException()))
return false;