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

bug 197281 - Introduction of XPCConvert::GetNativeInterfaceFromJSObject is causing problems r=jst, sr=alecf

Browse Source
This commit is contained in:
dbradley%netscape.com 2003-03-22 02:13:38 +00:00
parent bfea584f1f
commit bfd19c222e
1 changed files with 35 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
js/src/xpconnect/src/xpcconvert.cpp
View File

@ -1069,47 +1069,6 @@ XPCConvert::NativeInterface2JSObject(XPCCallContext& ccx,
return JS_FALSE;
}
/***************************************************************************/
// static
JSBool XPCConvert::GetNativeInterfaceFromJSObject(XPCCallContext& ccx,
void** dest, JSObject* src,
const nsID* iid,
nsresult* pErr)
{
nsISupports* identity;
// Note that if we have a non-null aOuter then it means that we are
// forcing the creation of a wrapper even if the object *is* a
// wrappedNative or other wise has 'nsISupportness'.
// This allows wrapJSAggregatedToNative to work.
// Is this really a native xpcom object with a wrapper?
XPCWrappedNative* wrappedNative =
XPCWrappedNative::GetWrappedNativeOfJSObject(ccx, src);
if(wrappedNative)
{
identity = wrappedNative->GetIdentityObject();
// is the underlying object the right interface?
if(wrappedNative->GetIID().Equals(*iid))
{
NS_ADDREF(identity);
*dest = identity;
return JS_TRUE;
}
else
return NS_SUCCEEDED(identity->QueryInterface(*iid, dest));
}
// else...
// Does the JSObject have 'nsISupportness'?
// XXX hmm, I wonder if this matters anymore with no
// oldstyle DOM objects around.
if(GetISupportsFromJSObject(ccx, src, &identity) && identity)
{
return NS_SUCCEEDED(identity->QueryInterface(*iid, dest));
}
return JS_FALSE;
}
/***************************************************************************/
// static
@ -1130,14 +1089,45 @@ XPCConvert::JSObject2NativeInterface(XPCCallContext& ccx,
if(pErr)
*pErr = NS_ERROR_XPC_BAD_CONVERT_JS;
nsISupports* iface;
if(!aOuter)
{
// See if this is really an wrapped XPCOM object
if(GetNativeInterfaceFromJSObject(ccx, dest, src, iid, pErr))
return JS_TRUE;
// Note that if we have a non-null aOuter then it means that we are
// forcing the creation of a wrapper even if the object *is* a
// wrappedNative or other wise has 'nsISupportness'.
// This allows wrapJSAggregatedToNative to work.
// Is this really a native xpcom object with a wrapper?
XPCWrappedNative* wrappedNative =
XPCWrappedNative::GetWrappedNativeOfJSObject(cx, src);
if(wrappedNative)
{
iface = wrappedNative->GetIdentityObject();
// is the underlying object the right interface?
if(wrappedNative->GetIID().Equals(*iid))
{
NS_ADDREF(iface);
*dest = iface;
return JS_TRUE;
}
return NS_SUCCEEDED(iface->QueryInterface(*iid, dest));
}
// else...
// Does the JSObject have 'nsISupportness'?
// XXX hmm, I wonder if this matters anymore with no
// oldstyle DOM objects around.
if(GetISupportsFromJSObject(cx, src, &iface))
{
if(iface)
return NS_SUCCEEDED(iface->QueryInterface(*iid, dest));
return JS_FALSE;
}
}
// else create a new wrapper
// else...
nsXPCWrappedJS* wrapper;
nsresult rv = nsXPCWrappedJS::GetNewOrUsed(ccx, src, *iid, aOuter, &wrapper);