Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1142282 part 3. Remove the parent argument of NewNativeObjectWithClassProto. r=waldo

Browse Source
This commit is contained in:
Boris Zbarsky 2015-03-11 22:33:59 -04:00
parent a34c94dd8a
commit 46b5adbff8
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jsobj.cpp
View File

@ -2469,12 +2469,9 @@ DefineConstructorAndPrototype(JSContext *cx, HandleObject obj, JSProtoKey key, H
/*
* Create the prototype object. (GlobalObject::createBlankPrototype isn't
* used because it parents the prototype object to the global and because
* it uses WithProto::Given. FIXME: Undo dependencies on this parentage
* [which already needs to happen for bug 638316], figure out nicer
* semantics for null-protoProto, and use createBlankPrototype.)
* used because it won't let us use protoProto as the proto.
*/
RootedNativeObject proto(cx, NewNativeObjectWithClassProto(cx, clasp, protoProto, obj, SingletonObject));
RootedNativeObject proto(cx, NewNativeObjectWithClassProto(cx, clasp, protoProto, SingletonObject));
if (!proto)
return nullptr;

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

@ -166,8 +166,7 @@ js::OnUnknownMethod(JSContext *cx, HandleObject obj, Value idval_, MutableHandle
return false;
if (value.isObject()) {
NativeObject *obj = NewNativeObjectWithClassProto(cx, &js_NoSuchMethodClass, NullPtr(),
NullPtr());
NativeObject *obj = NewNativeObjectWithClassProto(cx, &js_NoSuchMethodClass, NullPtr());
if (!obj)
return false;

8
js/src/vm/NativeObject-inl.h
View File

@ -376,17 +376,17 @@ NewNativeObjectWithGivenProto(ExclusiveContext *cx, const Class *clasp,
inline NativeObject *
NewNativeObjectWithClassProto(ExclusiveContext *cx, const Class *clasp, HandleObject proto,
HandleObject parent, gc::AllocKind allocKind,
gc::AllocKind allocKind,
NewObjectKind newKind = GenericObject)
{
return MaybeNativeObject(NewObjectWithClassProto(cx, clasp, proto, parent, allocKind, newKind));
return MaybeNativeObject(NewObjectWithClassProto(cx, clasp, proto, NullPtr(), allocKind, newKind));
}
inline NativeObject *
NewNativeObjectWithClassProto(ExclusiveContext *cx, const Class *clasp, HandleObject proto,
HandleObject parent, NewObjectKind newKind = GenericObject)
NewObjectKind newKind = GenericObject)
{
return MaybeNativeObject(NewObjectWithClassProto(cx, clasp, proto, parent, newKind));
return MaybeNativeObject(NewObjectWithClassProto(cx, clasp, proto, NullPtr(), newKind));
}
/*