mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1140582. Remove the parent argument from JS_NewObjectWithUniqueType. r=waldo
This commit is contained in:
parent
7fdbca2023
commit
8ece71391b
@ -1898,8 +1898,7 @@ ResolvePrototype(nsIXPConnect *aXPConnect, nsGlobalWindow *aWin, JSContext *cx,
|
|||||||
}
|
}
|
||||||
dot_prototype = ::JS_NewObjectWithUniqueType(cx,
|
dot_prototype = ::JS_NewObjectWithUniqueType(cx,
|
||||||
&sDOMConstructorProtoClass,
|
&sDOMConstructorProtoClass,
|
||||||
proto,
|
proto);
|
||||||
winobj);
|
|
||||||
NS_ENSURE_TRUE(dot_prototype, NS_ERROR_OUT_OF_MEMORY);
|
NS_ENSURE_TRUE(dot_prototype, NS_ERROR_OUT_OF_MEMORY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -614,7 +614,7 @@ CreateInterfacePrototypeObject(JSContext* cx, JS::Handle<JSObject*> global,
|
|||||||
const NativeProperties* chromeOnlyProperties)
|
const NativeProperties* chromeOnlyProperties)
|
||||||
{
|
{
|
||||||
JS::Rooted<JSObject*> ourProto(cx,
|
JS::Rooted<JSObject*> ourProto(cx,
|
||||||
JS_NewObjectWithUniqueType(cx, Jsvalify(protoClass), parentProto, global));
|
JS_NewObjectWithUniqueType(cx, Jsvalify(protoClass), parentProto));
|
||||||
if (!ourProto ||
|
if (!ourProto ||
|
||||||
!DefineProperties(cx, ourProto, properties, chromeOnlyProperties)) {
|
!DefineProperties(cx, ourProto, properties, chromeOnlyProperties)) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
@ -127,8 +127,7 @@ JS_SplicePrototype(JSContext *cx, HandleObject obj, HandleObject proto)
|
|||||||
}
|
}
|
||||||
|
|
||||||
JS_FRIEND_API(JSObject *)
|
JS_FRIEND_API(JSObject *)
|
||||||
JS_NewObjectWithUniqueType(JSContext *cx, const JSClass *clasp, HandleObject proto,
|
JS_NewObjectWithUniqueType(JSContext *cx, const JSClass *clasp, HandleObject proto)
|
||||||
HandleObject parent)
|
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Create our object with a null proto and then splice in the correct proto
|
* Create our object with a null proto and then splice in the correct proto
|
||||||
@ -137,7 +136,7 @@ JS_NewObjectWithUniqueType(JSContext *cx, const JSClass *clasp, HandleObject pro
|
|||||||
* we're not going to be using that ObjectGroup anyway.
|
* we're not going to be using that ObjectGroup anyway.
|
||||||
*/
|
*/
|
||||||
RootedObject obj(cx, NewObjectWithGivenProto(cx, (const js::Class *)clasp, NullPtr(),
|
RootedObject obj(cx, NewObjectWithGivenProto(cx, (const js::Class *)clasp, NullPtr(),
|
||||||
parent, SingletonObject));
|
NullPtr(), SingletonObject));
|
||||||
if (!obj)
|
if (!obj)
|
||||||
return nullptr;
|
return nullptr;
|
||||||
if (!JS_SplicePrototype(cx, obj, proto))
|
if (!JS_SplicePrototype(cx, obj, proto))
|
||||||
|
@ -57,8 +57,7 @@ extern JS_FRIEND_API(bool)
|
|||||||
JS_SplicePrototype(JSContext *cx, JS::HandleObject obj, JS::HandleObject proto);
|
JS_SplicePrototype(JSContext *cx, JS::HandleObject obj, JS::HandleObject proto);
|
||||||
|
|
||||||
extern JS_FRIEND_API(JSObject *)
|
extern JS_FRIEND_API(JSObject *)
|
||||||
JS_NewObjectWithUniqueType(JSContext *cx, const JSClass *clasp, JS::HandleObject proto,
|
JS_NewObjectWithUniqueType(JSContext *cx, const JSClass *clasp, JS::HandleObject proto);
|
||||||
JS::HandleObject parent);
|
|
||||||
|
|
||||||
// Allocate an object in exactly the same way as JS_NewObjectWithGivenProto, but
|
// Allocate an object in exactly the same way as JS_NewObjectWithGivenProto, but
|
||||||
// without invoking the metadata callback on it. This allows creation of
|
// without invoking the metadata callback on it. This allows creation of
|
||||||
|
@ -87,10 +87,10 @@ XPCWrappedNativeProto::Init(const XPCNativeScriptableCreateInfo* scriptableCreat
|
|||||||
jsclazz = &XPC_WN_NoMods_NoCall_Proto_JSClass;
|
jsclazz = &XPC_WN_NoMods_NoCall_Proto_JSClass;
|
||||||
}
|
}
|
||||||
|
|
||||||
JS::RootedObject parent(cx, mScope->GetGlobalJSObject());
|
JS::RootedObject global(cx, mScope->GetGlobalJSObject());
|
||||||
JS::RootedObject proto(cx, JS_GetObjectPrototype(cx, parent));
|
JS::RootedObject proto(cx, JS_GetObjectPrototype(cx, global));
|
||||||
mJSProtoObject = JS_NewObjectWithUniqueType(cx, js::Jsvalify(jsclazz),
|
mJSProtoObject = JS_NewObjectWithUniqueType(cx, js::Jsvalify(jsclazz),
|
||||||
proto, parent);
|
proto);
|
||||||
|
|
||||||
bool success = !!mJSProtoObject;
|
bool success = !!mJSProtoObject;
|
||||||
if (success) {
|
if (success) {
|
||||||
|
Loading…
Reference in New Issue
Block a user