From da7fa465a797e57ac20b11fae0075819950cb062 Mon Sep 17 00:00:00 2001 From: "brendan%mozilla.org" Date: Sun, 28 Sep 2003 04:55:50 +0000 Subject: [PATCH] Better version of last change, thanks to caillon for reminding me. git-svn-id: svn://10.0.0.236/trunk@147384 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/caps/include/nsScriptSecurityManager.h | 2 -- mozilla/caps/src/nsCodebasePrincipal.cpp | 3 ++- mozilla/caps/src/nsPrincipal.cpp | 3 ++- mozilla/caps/src/nsScriptSecurityManager.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mozilla/caps/include/nsScriptSecurityManager.h b/mozilla/caps/include/nsScriptSecurityManager.h index f8f9f03897f..5076be2e1fe 100644 --- a/mozilla/caps/include/nsScriptSecurityManager.h +++ b/mozilla/caps/include/nsScriptSecurityManager.h @@ -285,8 +285,6 @@ public: JSContext* GetSafeJSContext(); - static nsScriptSecurityManager *gScriptSecMan; - private: // GetScriptSecurityManager is the only call that can make one diff --git a/mozilla/caps/src/nsCodebasePrincipal.cpp b/mozilla/caps/src/nsCodebasePrincipal.cpp index b92f09748df..8279e527c42 100644 --- a/mozilla/caps/src/nsCodebasePrincipal.cpp +++ b/mozilla/caps/src/nsCodebasePrincipal.cpp @@ -234,7 +234,8 @@ nsCodebasePrincipal::Equals(nsIPrincipal *aOther, PRBool *result) otherCodebase->GetURI(getter_AddRefs(otherURI)); NS_ENSURE_TRUE(otherURI, NS_ERROR_FAILURE); - return gScriptSecMan->SecurityCompareURIs(mURI, otherURI, result); + return nsScriptSecurityManager::GetScriptSecurityManager() + ->SecurityCompareURIs(mURI, otherURI, result); } ////////////////////////////////////////// diff --git a/mozilla/caps/src/nsPrincipal.cpp b/mozilla/caps/src/nsPrincipal.cpp index adba6a2c751..7c87a8d1bd2 100755 --- a/mozilla/caps/src/nsPrincipal.cpp +++ b/mozilla/caps/src/nsPrincipal.cpp @@ -215,7 +215,8 @@ nsPrincipal::Equals(nsIPrincipal *aOther, PRBool *aResult) aOther->GetURI(getter_AddRefs(otherOrigin)); } - return gScriptSecMan->SecurityCompareURIs(origin, otherOrigin, aResult); + return nsScriptSecurityManager::GetScriptSecurityManager() + ->SecurityCompareURIs(origin, otherOrigin, aResult); } *aResult = PR_TRUE; diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index 76140fafdf9..3d74bf066c4 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -2703,7 +2703,7 @@ nsresult nsScriptSecurityManager::Init() return NS_OK; } -nsScriptSecurityManager *nsScriptSecurityManager::gScriptSecMan = nsnull; +static nsScriptSecurityManager *gScriptSecMan = nsnull; jsval nsScriptSecurityManager::sEnabledID = JSVAL_VOID;