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 692342 - Create a ConvertDependentParam(i) method to match ConvertIndependentParam(i) (modulo reindentation). r=mrbkap

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

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

@ -2123,6 +2123,7 @@ class CallMethodHelper
JS_ALWAYS_INLINE JSBool ConvertIndependentParams(JSBool* foundDependentParam);
JS_ALWAYS_INLINE JSBool ConvertIndependentParam(uint8 i);
JS_ALWAYS_INLINE JSBool ConvertDependentParams();
JS_ALWAYS_INLINE JSBool ConvertDependentParam(uint8 i);
JS_ALWAYS_INLINE void CleanupParam(nsXPTCMiniVariant& param, nsXPTType& type);
@ -2693,11 +2694,21 @@ CallMethodHelper::ConvertDependentParams()
const uint8 paramCount = mMethodInfo->GetParamCount();
for (uint8 i = 0; i < paramCount; i++) {
const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
const nsXPTType& type = paramInfo.GetType();
if (!type.IsDependent())
if (!paramInfo.GetType().IsDependent())
continue;
if (!ConvertDependentParam(i))
return JS_FALSE;
}
return JS_TRUE;
}
JSBool
CallMethodHelper::ConvertDependentParam(uint8 i)
{
const nsXPTParamInfo& paramInfo = mMethodInfo->GetParam(i);
const nsXPTType& type = paramInfo.GetType();
nsXPTType datum_type;
JSUint32 array_count = 0;
bool isArray = type.IsArray();
@ -2740,7 +2751,7 @@ CallMethodHelper::ConvertDependentParams()
}
if (!paramInfo.IsIn())
continue;
return JS_TRUE;
} else {
NS_ASSERTION(i < mArgc || paramInfo.IsOptional(),
"Expected either enough arguments or an optional argument");
@ -2791,9 +2802,8 @@ CallMethodHelper::ConvertDependentParams()
return JS_FALSE;
}
}
}
return JS_TRUE;
return JS_TRUE;
}
// Performs all necessary teardown on a parameter after method invocation.