From 5ef28275ca9e2ff006e62f88befd0d957bc8a51e Mon Sep 17 00:00:00 2001
From: "norris%netscape.com"
 <norris%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 15 Sep 1999 23:27:34 +0000
Subject: [PATCH] Remove use of nsCOMPtr to fix Mac bustage.

git-svn-id: svn://10.0.0.236/trunk@47674 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
index d7656c982d5..1e9f5510448 100644
--- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -31,7 +31,6 @@
 #include "nsIScriptContext.h"
 #include "nsIScriptContextOwner.h"
 #include "nsJSProtocolHandler.h"
-#include "nsCOMPtr.h"
 #include "nsIPrincipal.h"
 #include "jsapi.h"
 #include "nsIJSContextStack.h"
@@ -53,7 +52,7 @@ public:
 
     nsJSInputStream()
         : mVerb(nsnull), mURI(nsnull), mEventSinkGetter(nsnull),
-          mResult(nsnull), mLength(0), mReadCursor(0) {
+          mResult(nsnull), mLength(0), mReadCursor(0), mPrincipal(nsnull) {
         NS_INIT_REFCNT();
     }
 
@@ -64,6 +63,7 @@ public:
         NS_IF_RELEASE(mEventSinkGetter);
         if (mResult)
             nsCRT::free(mResult);
+        NS_IF_RELEASE(mPrincipal);
     }
 
     nsresult Init(const char* verb, nsIURI* uri,
@@ -82,10 +82,8 @@ public:
                         NS_SCRIPTSECURITYMANAGER_PROGID, &result);
         if (NS_FAILED(result)) 
             return NS_ERROR_FAILURE;
-        if (NS_FAILED(securityManager->GetSubjectPrincipal(
-                        getter_AddRefs(mPrincipal))))
+        if (NS_FAILED(securityManager->GetSubjectPrincipal(&mPrincipal)))
             return NS_ERROR_FAILURE;
-
         return NS_OK;
     }
 
@@ -184,7 +182,7 @@ protected:
     char*                   mResult;
     PRUint32                mLength;
     PRUint32                mReadCursor;
-    nsCOMPtr<nsIPrincipal>  mPrincipal;
+    nsIPrincipal*           mPrincipal;
 };
 
 NS_IMPL_ISUPPORTS(nsJSInputStream, NS_GET_IID(nsIInputStream));