From 3ad995326c12079cab9d486765cb8780f63be2a3 Mon Sep 17 00:00:00 2001
From: "jshin%mailaps.org"
 <jshin%mailaps.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 2 Feb 2005 07:17:53 +0000
Subject: [PATCH] bug 280613 : checkLoadURIStr of nsIScriptSecurityManager
 should accept AUTF8String istead of string (for IDN), r=dveditz, sr=darin

git-svn-id: svn://10.0.0.236/trunk@168696 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/caps/idl/nsIScriptSecurityManager.idl | 5 +++--
 mozilla/caps/src/nsScriptSecurityManager.cpp  | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mozilla/caps/idl/nsIScriptSecurityManager.idl b/mozilla/caps/idl/nsIScriptSecurityManager.idl
index 3b5cbd1afa8..55b8e1dbf5d 100644
--- a/mozilla/caps/idl/nsIScriptSecurityManager.idl
+++ b/mozilla/caps/idl/nsIScriptSecurityManager.idl
@@ -40,7 +40,8 @@
 #include "nsIXPCSecurityManager.idl"
 interface nsIURI;
 
-[scriptable, uuid(82bff35d-ebb7-4cb9-bb47-4f9ebdf11f77)]
+
+[scriptable, uuid(463eb1fa-9dac-4ca7-826f-1fc921971d3a)]
 interface nsIScriptSecurityManager : nsIXPCSecurityManager
 {
     ///////////////// Security Checks //////////////////
@@ -118,7 +119,7 @@ interface nsIScriptSecurityManager : nsIXPCSecurityManager
      * Same as CheckLoadURI but takes string arguments for ease of use
      * by scripts
      */
-    void checkLoadURIStr(in string from, in string uri, 
+    void checkLoadURIStr(in AUTF8String from, in AUTF8String uri, 
                          in unsigned long flags);
 
     /**
diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp
index 86fab51b582..2be5de35144 100644
--- a/mozilla/caps/src/nsScriptSecurityManager.cpp
+++ b/mozilla/caps/src/nsScriptSecurityManager.cpp
@@ -1403,17 +1403,16 @@ nsScriptSecurityManager::ReportError(JSContext* cx, const nsAString& messageTag,
 }
 
 NS_IMETHODIMP
-nsScriptSecurityManager::CheckLoadURIStr(const char* aSourceURIStr, const char* aTargetURIStr,
+nsScriptSecurityManager::CheckLoadURIStr(const nsACString& aSourceURIStr,
+                                         const nsACString& aTargetURIStr,
                                          PRUint32 aFlags)
 {
     nsCOMPtr<nsIURI> source;
-    nsresult rv = NS_NewURI(getter_AddRefs(source),
-                            nsDependentCString(aSourceURIStr),
+    nsresult rv = NS_NewURI(getter_AddRefs(source), aSourceURIStr,
                             nsnull, nsnull, sIOService);
     NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIURI> target;
-    rv = NS_NewURI(getter_AddRefs(target),
-                   nsDependentCString(aTargetURIStr),
+    rv = NS_NewURI(getter_AddRefs(target), aTargetURIStr,
                    nsnull, nsnull, sIOService);
     NS_ENSURE_SUCCESS(rv, rv);
     return CheckLoadURI(source, target, aFlags);