Bug 774585: Remove unused argument in nsScriptSecurityManager. r=mrbkap

This commit is contained in:
Jonas Sicking 2012-07-17 22:28:47 -07:00
parent b5d168a6b4
commit 9aab06b5f0
2 changed files with 4 additions and 10 deletions

View File

@ -418,7 +418,7 @@ private:
CheckPropertyAccessImpl(PRUint32 aAction,
nsAXPCNativeCallContext* aCallContext,
JSContext* cx, JSObject* aJSObject,
nsISupports* aObj, nsIURI* aTargetURI,
nsISupports* aObj,
nsIClassInfo* aClassInfo,
const char* aClassName, jsid aProperty,
void** aCachedClassPolicy);

View File

@ -572,7 +572,7 @@ nsScriptSecurityManager::CheckPropertyAccess(JSContext* cx,
PRUint32 aAction)
{
return CheckPropertyAccessImpl(aAction, nsnull, cx, aJSObject,
nsnull, nsnull, nsnull,
nsnull, nsnull,
aClassName, aProperty, nsnull);
}
@ -646,7 +646,7 @@ nsresult
nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
nsAXPCNativeCallContext* aCallContext,
JSContext* cx, JSObject* aJSObject,
nsISupports* aObj, nsIURI* aTargetURI,
nsISupports* aObj,
nsIClassInfo* aClassInfo,
const char* aClassName, jsid aProperty,
void** aCachedClassPolicy)
@ -722,12 +722,6 @@ nsScriptSecurityManager::CheckPropertyAccessImpl(PRUint32 aAction,
if (!objectPrincipal)
rv = NS_ERROR_DOM_SECURITY_ERR;
}
else if(aTargetURI)
{
if (NS_FAILED(GetCodebasePrincipal(
aTargetURI, getter_AddRefs(objectPrincipal))))
return NS_ERROR_FAILURE;
}
else
{
NS_ERROR("CheckPropertyAccessImpl called without a target object or URL");
@ -2803,7 +2797,7 @@ nsScriptSecurityManager::CanAccess(PRUint32 aAction,
void** aPolicy)
{
return CheckPropertyAccessImpl(aAction, aCallContext, cx,
aJSObject, aObj, nsnull, aClassInfo,
aJSObject, aObj, aClassInfo,
nsnull, aPropertyName, aPolicy);
}