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 658909 - Remove GWNOJO from JSValToXPCException. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2013-03-21 08:20:44 -07:00
parent 174fac9ba4
commit f6df1b589a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/xpconnect/src/XPCConvert.cpp
View File

@ -1177,9 +1177,12 @@ XPCConvert::JSValToXPCException(XPCCallContext& ccx,
} }
// is this really a native xpcom object with a wrapper? // is this really a native xpcom object with a wrapper?
XPCWrappedNative* wrapper; JSObject *unwrapped = js::UnwrapObjectChecked(obj, /* stopAtOuter = */ false);
if (nullptr != (wrapper = if (!unwrapped)
XPCWrappedNative::GetWrappedNativeOfJSObject(cx,obj))) { return NS_ERROR_XPC_SECURITY_MANAGER_VETO;
XPCWrappedNative* wrapper = IS_WN_WRAPPER(unwrapped) ? XPCWrappedNative::Get(unwrapped)
: nullptr;
if (wrapper) {
nsISupports* supports = wrapper->GetIdentityObject(); nsISupports* supports = wrapper->GetIdentityObject();
nsCOMPtr<nsIException> iface = do_QueryInterface(supports); nsCOMPtr<nsIException> iface = do_QueryInterface(supports);
if (iface) { if (iface) {