From 9aab06b5f0b9975c186baf6c748aebba3b168592 Mon Sep 17 00:00:00 2001 From: Jonas Sicking Date: Tue, 17 Jul 2012 22:28:47 -0700 Subject: [PATCH] Bug 774585: Remove unused argument in nsScriptSecurityManager. r=mrbkap --- caps/include/nsScriptSecurityManager.h | 2 +- caps/src/nsScriptSecurityManager.cpp | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/caps/include/nsScriptSecurityManager.h b/caps/include/nsScriptSecurityManager.h index 84948f351b8..66bef106c31 100644 --- a/caps/include/nsScriptSecurityManager.h +++ b/caps/include/nsScriptSecurityManager.h @@ -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); diff --git a/caps/src/nsScriptSecurityManager.cpp b/caps/src/nsScriptSecurityManager.cpp index d39f83bdbee..d135d87c3a2 100644 --- a/caps/src/nsScriptSecurityManager.cpp +++ b/caps/src/nsScriptSecurityManager.cpp @@ -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); }