Changed GetDocumentLoadGroup(...) to be XPCom complient. THis helps prevent leaks when using nsCOMPtrs.

content/xml/document/src/nsXMLContentSink.cpp

@@ -1829,11 +1829,12 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
       NS_ADDREF(this);
 
       nsIUnicharStreamLoader* loader;
+      nsCOMPtr<nsILoadGroup> loadGroup;
+
+      mDocument->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
       rv = NS_NewUnicharStreamLoader(&loader,
                                      url, 
-#ifdef NECKO
-                                     nsCOMPtr<nsILoadGroup>(mDocument->GetDocumentLoadGroup()),
-#endif
+                                     loadGroup,
                                      (nsStreamCompleteFunc)nsDoneLoadingScript, 
                                      (void *)this);
       NS_RELEASE(url);

content/xul/document/src/nsXULDocument.cpp

@@ -538,7 +538,7 @@ public:
 
     virtual nsIPrincipal* GetDocumentPrincipal() const;
 
-    virtual nsILoadGroup* GetDocumentLoadGroup() const;
+    NS_IMETHOD GetDocumentLoadGroup(nsILoadGroup **aGroup) const;
 
     NS_IMETHOD GetBaseURL(nsIURI*& aURL) const;
 
@@ -1525,13 +1525,12 @@ XULDocumentImpl::GetDocumentPrincipal() const
     return result;
 }
 
-
-nsILoadGroup* 
-XULDocumentImpl::GetDocumentLoadGroup() const
+NS_IMETHODIMP
+XULDocumentImpl::GetDocumentLoadGroup(nsILoadGroup **aGroup) const
 {
-    nsILoadGroup* result = mDocumentLoadGroup;
-    NS_IF_ADDREF(result);
-    return result;
+    *aGroup = mDocumentLoadGroup;
+    NS_IF_ADDREF(*aGroup);
+    return NS_OK;
 }
 
 NS_IMETHODIMP 

layout/base/nsPresContext.cpp

@@ -783,7 +783,7 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult)
     if (NS_SUCCEEDED(mShell->GetDocument(getter_AddRefs(doc)))) {
       NS_ASSERTION(doc, "expect document here");
       if (doc) {
-        loadGroup = doc->GetDocumentLoadGroup();
+        doc->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
       }
     }
 #else

layout/base/src/nsPresContext.cpp

@@ -783,7 +783,7 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult)
     if (NS_SUCCEEDED(mShell->GetDocument(getter_AddRefs(doc)))) {
       NS_ASSERTION(doc, "expect document here");
       if (doc) {
-        loadGroup = doc->GetDocumentLoadGroup();
+        doc->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
       }
     }
 #else

layout/xml/document/src/nsXMLContentSink.cpp

@@ -1829,11 +1829,12 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
       NS_ADDREF(this);
 
       nsIUnicharStreamLoader* loader;
+      nsCOMPtr<nsILoadGroup> loadGroup;
+
+      mDocument->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
       rv = NS_NewUnicharStreamLoader(&loader,
                                      url, 
-#ifdef NECKO
-                                     nsCOMPtr<nsILoadGroup>(mDocument->GetDocumentLoadGroup()),
-#endif
+                                     loadGroup,
                                      (nsStreamCompleteFunc)nsDoneLoadingScript, 
                                      (void *)this);
       NS_RELEASE(url);

rdf/content/src/nsXULDocument.cpp

@@ -538,7 +538,7 @@ public:
 
     virtual nsIPrincipal* GetDocumentPrincipal() const;
 
-    virtual nsILoadGroup* GetDocumentLoadGroup() const;
+    NS_IMETHOD GetDocumentLoadGroup(nsILoadGroup **aGroup) const;
 
     NS_IMETHOD GetBaseURL(nsIURI*& aURL) const;
 
@@ -1525,13 +1525,12 @@ XULDocumentImpl::GetDocumentPrincipal() const
     return result;
 }
 
-
-nsILoadGroup* 
-XULDocumentImpl::GetDocumentLoadGroup() const
+NS_IMETHODIMP
+XULDocumentImpl::GetDocumentLoadGroup(nsILoadGroup **aGroup) const
 {
-    nsILoadGroup* result = mDocumentLoadGroup;
-    NS_IF_ADDREF(result);
-    return result;
+    *aGroup = mDocumentLoadGroup;
+    NS_IF_ADDREF(*aGroup);
+    return NS_OK;
 }
 
 NS_IMETHODIMP 

rdf/datasource/src/nsXULContentSink.cpp

@@ -1597,11 +1597,12 @@ XULContentSinkImpl::OpenScript(const nsIParserNode& aNode)
             mCurrentScriptURL = url;
 
             nsIUnicharStreamLoader* loader;
+            nsCOMPtr<nsILoadGroup> group;
+
+            mDocument->GetDocumentLoadGroup(getter_AddRefs(group));
             rv = NS_NewUnicharStreamLoader(&loader,
                                            url, 
-#ifdef NECKO
-                                           nsCOMPtr<nsILoadGroup>(mDocument->GetDocumentLoadGroup()),
-#endif
+                                           group,
                                            (nsStreamCompleteFunc)DoneLoadingScript, 
                                            (void *)this);
             NS_RELEASE(url);