From 841688e9b93183343da2bce7284209fa2da2266b Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 29 Sep 2004 22:05:12 +0000
Subject: [PATCH] backing out part of bug 234257 checkin to fix camino orange
 a=shaver

git-svn-id: svn://10.0.0.236/trunk@162979 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/base/nsDocShell.cpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index f4b00b47a4d..a75e877c72e 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -421,13 +421,22 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID & aIID, void **aSink)
              || aIID.Equals(NS_GET_IID(nsIHttpEventSink))
              || aIID.Equals(NS_GET_IID(nsIWebProgress))
              || aIID.Equals(NS_GET_IID(nsISecurityEventSink))) {
-        // mLoadCookie is our nsIDocumentLoader
-        nsCOMPtr<nsIInterfaceRequestor> requestor(do_QueryInterface(mLoadCookie));
-        nsresult rv = NS_ERROR_FAILURE;
-        if (requestor)
-          rv = requestor->GetInterface(aIID, aSink);
-
-        return rv;
+        nsCOMPtr<nsIURILoader>
+            uriLoader(do_GetService(NS_URI_LOADER_CONTRACTID));
+        NS_ENSURE_TRUE(uriLoader, NS_ERROR_FAILURE);
+        nsCOMPtr<nsIDocumentLoader> docLoader;
+        NS_ENSURE_SUCCESS(uriLoader->
+                          GetDocumentLoaderForContext(this,
+                                                      getter_AddRefs
+                                                      (docLoader)),
+                          NS_ERROR_FAILURE);
+        if (docLoader) {
+            nsCOMPtr<nsIInterfaceRequestor>
+                requestor(do_QueryInterface(docLoader));
+            return requestor->GetInterface(aIID, aSink);
+        }
+        else
+            return NS_ERROR_FAILURE;
     }
     else if (aIID.Equals(NS_GET_IID(nsISHistory))) {
         nsCOMPtr<nsISHistory> shistory;