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

Bug 692342 - Move some things below Do datum_type resolution in ConvertDependentParam. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2011-11-25 17:09:07 -08:00
parent 1c570b90b8
commit cfa9352217
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2732,25 +2732,25 @@ CallMethodHelper::ConvertDependentParam(uint8 i)
nsXPTCVariant* dp = GetDispatchParam(i);
dp->type = type;
// Specify the correct storage/calling semantics.
if (paramInfo.IsIndirect())
dp->SetIndirect();
if (isArray) {
if (NS_FAILED(mIFaceInfo->GetTypeForParam(mVTableIndex, &paramInfo, 1,
&datum_type))) {
Throw(NS_ERROR_XPC_CANT_GET_ARRAY_INFO, mCallContext);
return JS_FALSE;
}
if (datum_type.IsPointer())
dp->SetValNeedsCleanup();
} else {
datum_type = type;
}
if (datum_type.IsInterfacePointer()) {
// Specify the correct storage/calling semantics.
if (paramInfo.IsIndirect())
dp->SetIndirect();
if (isArray && datum_type.IsPointer())
dp->SetValNeedsCleanup();
if (datum_type.IsInterfacePointer())
dp->SetValNeedsCleanup();
}
// Even if there's nothing to convert, we still need to examine the
// JSObject container for out-params. If it's null or otherwise invalid,