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 1136516. Stop using JS_DeprecatedNewObjectWithGivenProtoAndParent in XPCWrappedNative. r=bholley

Browse Source
This commit is contained in:
Boris Zbarsky 2015-02-26 09:40:08 -05:00
parent 74abff9081
commit d80fb20630
2 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/xpconnect/src/XPCWrappedNative.cpp
View File

@ -352,8 +352,6 @@ XPCWrappedNative::GetNewOrUsed(xpcObjectHelper& helper,
RootedObject parent(cx, Scope->GetGlobalJSObject());
RootedValue newParentVal(cx, NullValue());
mozilla::Maybe<JSAutoCompartment> ac;
if (sciWrapper.GetFlags().WantPreCreate()) {
@ -367,14 +365,16 @@ XPCWrappedNative::GetNewOrUsed(xpcObjectHelper& helper,
MOZ_ASSERT(!xpc::WrapperFactory::IsXrayWrapper(parent),
"Xray wrapper being used to parent XPCWrappedNative?");
MOZ_ASSERT(js::GetGlobalForObjectCrossCompartment(parent) == parent,
"Non-global being used to parent XPCWrappedNative?");
ac.emplace(static_cast<JSContext*>(cx), parent);
if (parent != plannedParent) {
XPCWrappedNativeScope* betterScope = ObjectScope(parent);
if (betterScope != Scope)
return GetNewOrUsed(helper, betterScope, Interface, resultWrapper);
newParentVal = OBJECT_TO_JSVAL(parent);
MOZ_ASSERT(betterScope != Scope,
"How can we have the same scope for two different globals?");
return GetNewOrUsed(helper, betterScope, Interface, resultWrapper);
}
// Take the performance hit of checking the hashtable again in case
@ -439,7 +439,7 @@ XPCWrappedNative::GetNewOrUsed(xpcObjectHelper& helper,
// *seen* this happen.
AutoMarkingWrappedNativePtr wrapperMarker(cx, wrapper);
if (!wrapper->Init(parent, &sciWrapper))
if (!wrapper->Init(&sciWrapper))
return NS_ERROR_FAILURE;
if (!wrapper->FindTearOff(Interface, false, &rv)) {
@ -736,8 +736,7 @@ XPCWrappedNative::GatherScriptableCreateInfo(nsISupports* obj,
}
bool
XPCWrappedNative::Init(HandleObject parent,
const XPCNativeScriptableCreateInfo* sci)
XPCWrappedNative::Init(const XPCNativeScriptableCreateInfo* sci)
{
AutoJSContext cx;
// setup our scriptable info...
@ -772,16 +771,18 @@ XPCWrappedNative::Init(HandleObject parent,
jsclazz->convert &&
jsclazz->finalize, "bad class");
// XXXbz JS_GetObjectPrototype wants an object, even though it then asserts
// that this object is same-compartment with cx, which means it could just
// use the cx global...
RootedObject global(cx, CurrentGlobalOrNull(cx));
RootedObject protoJSObject(cx, HasProto() ?
GetProto()->GetJSProtoObject() :
JS_GetObjectPrototype(cx, parent));
JS_GetObjectPrototype(cx, global));
if (!protoJSObject) {
return false;
}
mFlatJSObject =
JS_DeprecatedNewObjectWithGivenProtoAndParent(cx, jsclazz,
protoJSObject, parent);
mFlatJSObject = JS_NewObjectWithGivenProto(cx, jsclazz, protoJSObject);
if (!mFlatJSObject) {
mFlatJSObject.unsetFlags(FLAT_JS_OBJECT_VALID);
return false;

23
js/xpconnect/src/xpcprivate.h
View File

@ -2234,7 +2234,7 @@ private:
private:
bool Init(JS::HandleObject parent, const XPCNativeScriptableCreateInfo* sci);
bool Init(const XPCNativeScriptableCreateInfo* sci);
bool FinishInit();
bool ExtendSet(XPCNativeInterface* aInterface);
@ -3758,27 +3758,6 @@ bool IsOutObject(JSContext* cx, JSObject* obj);
nsresult HasInstance(JSContext *cx, JS::HandleObject objArg, const nsID *iid, bool *bp);
/**
* Define quick stubs on the given object, @a proto.
*
* @param cx
* A context. Requires request.
* @param proto
* The (newly created) prototype object for a DOM class. The JS half
* of an XPCWrappedNativeProto.
* @param flags
* Property flags for the quick stub properties--should be either
* JSPROP_ENUMERATE or 0.
* @param interfaceCount
* The number of interfaces the class implements.
* @param interfaceArray
* The interfaces the class implements; interfaceArray and
* interfaceCount are like what nsIClassInfo.getInterfaces returns.
*/
bool
DOM_DefineQuickStubs(JSContext *cx, JSObject *proto, uint32_t flags,
uint32_t interfaceCount, const nsIID **interfaceArray);
nsIPrincipal *GetObjectPrincipal(JSObject *obj);
} // namespace xpc