Files:

caps/include/nsScriptSecurityManager.h
	caps/src/nsScriptSecurityManager.cpp
	modules/libpref/src/init/all.js
Fix
24565 nsScriptSecurityManager::GetSecurityLevel() is a performance
24567 re-write DOM glue security checks to avoid NS_WITH_SERVICE()
r=waterson

Files:
	dom/src/base/nsGlobalWindow.cpp
	layout/base/src/nsDocument.cpp
	layout/base/src/nsGenericElement.cpp
Fix assertion failure for 1-character property names.


Files:
	dom/src/jsurl/nsJSProtocolHandler.cpp
	webshell/src/nsDocLoader.cpp
Fix 18653 "javascript:" URLs cross windows problems (probably regressi
r=nisheeth

Files:
	layout/events/src/nsEventListenerManager.cpp
Fix
23834 document.onkeypress allows sniffing keystrokes
24152 document.onclick shows links from other window
r=joki


git-svn-id: svn://10.0.0.236/trunk@58429 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/caps/include/nsScriptSecurityManager.h

@@ -30,6 +30,8 @@
 #include "nsDOMPropEnums.h"
 #include "nsCOMPtr.h"
 
+class nsIPref;
+
 #define NS_SCRIPTSECURITYMANAGER_CID \
 { 0x7ee2a4c0, 0x4b93, 0x17d3, \
 { 0xba, 0x18, 0x00, 0x60, 0xb0, 0xf1, 0x99, 0xa2 }}
@@ -50,8 +52,6 @@ public:
     static nsScriptSecurityManager *
     GetScriptSecurityManager();
     
-    nsObjectHashtable *mOriginToPolicyMap;
-
 private:
     void
     LookupPrincipal(nsCOMPtr<nsIPrincipal>* aPrincipal);
@@ -67,10 +67,11 @@ private:
                      PRBool* result);
     PRInt32 
     GetSecurityLevel(nsIPrincipal *principal, nsDOMProp domProp, 
-                     PRBool isWrite, char **capability);
+                     PRBool isWrite, nsCString &capability);
 
     NS_IMETHOD
-    GetPrefName(nsIPrincipal *principal, nsDOMProp domProp, char **result);
+    GetPrefName(nsIPrincipal *principal, nsDOMProp domProp, 
+                nsCString &result);
 
     NS_IMETHOD
     CheckXPCPermissions(JSContext *cx);
@@ -87,6 +88,8 @@ private:
     static int
     JSEnabledPrefChanged(const char *pref, void *data);
 
+    nsObjectHashtable *mOriginToPolicyMap;
+    nsIPref *mPrefs;
     nsIPrincipal *mSystemPrincipal;
     nsSupportsHashtable *mPrincipals;
     PRBool mIsJavaScriptEnabled;