securebrowser-cast
author Benjamin Smedberg <benjamin@smedbergs.us>
Sat, 26 Jul 2008 22:49:39 -0400
changeset 167 a4da40849f5436e629c5732f4368c6c48189637f
parent 108 33529a5c309fd85dad4adb0f672eaeb6493195ad
permissions -rw-r--r--
State as of now

More blacklists... hopefully easy to backport.

diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
--- a/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
+++ b/security/manager/boot/src/nsSecureBrowserUIImpl.cpp
@@ -204,7 +204,7 @@ nsSecureBrowserUIImpl::Init(nsIDOMWindow
 
   PR_LOG(gSecureDocLog, PR_LOG_DEBUG,
          ("SecureUI:%p: Init: mWindow: %p, aWindow: %p\n", this,
-          window.get(), aWindow));
+          (nsIDOMWindow*) window, aWindow));
 #endif
 
   if (!aWindow) {
@@ -1109,7 +1109,7 @@ nsSecureBrowserUIImpl::OnStateChange(nsI
     {
       if (allowSecurityStateChange)
       {
-        ObtainEventSink(channel, temp_ToplevelEventSink);
+        ObtainEventSink(channel, getter_AddRefs(temp_ToplevelEventSink));
       }
     }
 
@@ -1176,7 +1176,7 @@ nsSecureBrowserUIImpl::OnStateChange(nsI
 // I'm keeping this as a separate function, in order to simplify the review
 // for bug 412456. We should inline this in a follow up patch.
 void nsSecureBrowserUIImpl::ObtainEventSink(nsIChannel *channel, 
-                                            nsCOMPtr<nsISecurityEventSink> &sink)
+                                            nsISecurityEventSink **sink)
 {
   if (!sink)
     NS_QueryNotificationCallbacks(channel, sink);
diff --git a/security/manager/boot/src/nsSecureBrowserUIImpl.h b/security/manager/boot/src/nsSecureBrowserUIImpl.h
--- a/security/manager/boot/src/nsSecureBrowserUIImpl.h
+++ b/security/manager/boot/src/nsSecureBrowserUIImpl.h
@@ -137,8 +137,8 @@ protected:
   void UpdateSubrequestMembers(nsISupports *securityInfo);
 
   void ObtainEventSink(nsIChannel *channel, 
-                       nsCOMPtr<nsISecurityEventSink> &sink);
-
+                       nsISecurityEventSink **sink);
+  
   nsCOMPtr<nsISupports> mSSLStatus;
   nsCOMPtr<nsISupports> mCurrentToplevelSecurityInfo;