mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Bug 703537 - Followup: fix conflicts.
This commit is contained in:
parent
3fb48a743e
commit
efcd6ffbea
@ -177,21 +177,21 @@ DirectWrapper::hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp)
|
||||
}
|
||||
|
||||
bool
|
||||
Wrapper::get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, Value *vp)
|
||||
DirectWrapper::get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, Value *vp)
|
||||
{
|
||||
vp->setUndefined(); // default result if we refuse to perform this action
|
||||
GET(wrappedObject(wrapper)->getGeneric(cx, RootedObject(cx, receiver), RootedId(cx, id), vp));
|
||||
}
|
||||
|
||||
bool
|
||||
Wrapper::set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict,
|
||||
DirectWrapper::set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict,
|
||||
Value *vp)
|
||||
{
|
||||
SET(wrappedObject(wrapper)->setGeneric(cx, RootedId(cx, id), vp, strict));
|
||||
}
|
||||
|
||||
bool
|
||||
Wrapper::keys(JSContext *cx, JSObject *wrapper, AutoIdVector &props)
|
||||
DirectWrapper::keys(JSContext *cx, JSObject *wrapper, AutoIdVector &props)
|
||||
{
|
||||
// if we refuse to perform this action, props remains empty
|
||||
const jsid id = JSID_VOID;
|
||||
|
Loading…
Reference in New Issue
Block a user