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

Bug 658909 - Remove GWNOJO from PreserveWrapper. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2013-03-21 08:20:45 -07:00
parent 3e1161c559
commit 97ae3186ae
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -2467,27 +2467,21 @@ PreserveWrapper(JSContext *cx, JSObject *obj)
if (!ccx.IsValid())
return false;
JSObject *obj2 = nullptr;
nsIXPConnectWrappedNative *wrapper =
XPCWrappedNative::GetWrappedNativeOfJSObject(cx, obj, nullptr, &obj2);
if (!IS_WRAPPER_CLASS(js::GetObjectClass(obj)))
return mozilla::dom::TryPreserveWrapper(obj);
nsISupports *supports = nullptr;
if (IS_WN_WRAPPER_OBJECT(obj))
supports = XPCWrappedNative::Get(obj)->Native();
else
supports = static_cast<nsISupports*>(xpc_GetJSPrivate(obj));
if (wrapper) {
supports = wrapper->Native();
} else if (obj2) {
supports = static_cast<nsISupports*>(xpc_GetJSPrivate(obj2));
// For pre-Paris DOM bindings objects, we only support Node.
if (nsCOMPtr<nsINode> node = do_QueryInterface(supports)) {
nsContentUtils::PreserveWrapper(supports, node);
return true;
}
if (supports) {
// For pre-Paris DOM bindings objects, we only support Node.
if (nsCOMPtr<nsINode> node = do_QueryInterface(supports)) {
nsContentUtils::PreserveWrapper(supports, node);
return true;
}
return false;
}
return mozilla::dom::TryPreserveWrapper(obj);
return false;
}
static nsresult