From 5d1fa83609fd4fc50707afcb987db19396c91290 Mon Sep 17 00:00:00 2001 From: "danm%netscape.com" Date: Mon, 29 Nov 1999 21:15:32 +0000 Subject: [PATCH] updated to match nsIWebShell interface change for travis@netscape.com git-svn-id: svn://10.0.0.236/trunk@54590 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 10 +++++----- mozilla/webshell/src/nsWebShell.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 1dfa715ef64..e0de7d00bdf 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -204,7 +204,7 @@ public: NS_IMETHOD GetContainer(nsIWebShellContainer*& aResult); NS_IMETHOD GetTopLevelWindow(nsIWebShellContainer** aWebShellWindow); NS_IMETHOD SetDocLoaderObserver(nsIDocumentLoaderObserver* anObserver); - NS_IMETHOD GetDocLoaderObserver(nsIDocumentLoaderObserver*& aResult); + NS_IMETHOD GetDocLoaderObserver(nsIDocumentLoaderObserver** aResult); NS_IMETHOD SetPrefs(nsIPref* aPrefs); NS_IMETHOD GetPrefs(nsIPref*& aPrefs); NS_IMETHOD GetRootWebShell(nsIWebShell*& aResult); @@ -1306,9 +1306,9 @@ nsWebShell::SetDocLoaderObserver(nsIDocumentLoaderObserver* anObserver) NS_IMETHODIMP -nsWebShell::GetDocLoaderObserver(nsIDocumentLoaderObserver*& aResult) +nsWebShell::GetDocLoaderObserver(nsIDocumentLoaderObserver** aResult) { - aResult = mDocLoaderObserver; + *aResult = mDocLoaderObserver; NS_IF_ADDREF(mDocLoaderObserver); return NS_OK; } @@ -3319,7 +3319,7 @@ nsWebShell::OnStartDocumentLoad(nsIDocumentLoader* loader, nsresult res = GetRootWebShell(*getter_AddRefs(root)); if (NS_SUCCEEDED(res) && root) - root->GetDocLoaderObserver(*getter_AddRefs(dlObserver)); + root->GetDocLoaderObserver(getter_AddRefs(dlObserver)); } else { @@ -3408,7 +3408,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, nsresult res = GetRootWebShell(*getter_AddRefs(root)); if (NS_SUCCEEDED(res) && root) - root->GetDocLoaderObserver(*getter_AddRefs(dlObserver)); + root->GetDocLoaderObserver(getter_AddRefs(dlObserver)); } else { diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 1dfa715ef64..e0de7d00bdf 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -204,7 +204,7 @@ public: NS_IMETHOD GetContainer(nsIWebShellContainer*& aResult); NS_IMETHOD GetTopLevelWindow(nsIWebShellContainer** aWebShellWindow); NS_IMETHOD SetDocLoaderObserver(nsIDocumentLoaderObserver* anObserver); - NS_IMETHOD GetDocLoaderObserver(nsIDocumentLoaderObserver*& aResult); + NS_IMETHOD GetDocLoaderObserver(nsIDocumentLoaderObserver** aResult); NS_IMETHOD SetPrefs(nsIPref* aPrefs); NS_IMETHOD GetPrefs(nsIPref*& aPrefs); NS_IMETHOD GetRootWebShell(nsIWebShell*& aResult); @@ -1306,9 +1306,9 @@ nsWebShell::SetDocLoaderObserver(nsIDocumentLoaderObserver* anObserver) NS_IMETHODIMP -nsWebShell::GetDocLoaderObserver(nsIDocumentLoaderObserver*& aResult) +nsWebShell::GetDocLoaderObserver(nsIDocumentLoaderObserver** aResult) { - aResult = mDocLoaderObserver; + *aResult = mDocLoaderObserver; NS_IF_ADDREF(mDocLoaderObserver); return NS_OK; } @@ -3319,7 +3319,7 @@ nsWebShell::OnStartDocumentLoad(nsIDocumentLoader* loader, nsresult res = GetRootWebShell(*getter_AddRefs(root)); if (NS_SUCCEEDED(res) && root) - root->GetDocLoaderObserver(*getter_AddRefs(dlObserver)); + root->GetDocLoaderObserver(getter_AddRefs(dlObserver)); } else { @@ -3408,7 +3408,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, nsresult res = GetRootWebShell(*getter_AddRefs(root)); if (NS_SUCCEEDED(res) && root) - root->GetDocLoaderObserver(*getter_AddRefs(dlObserver)); + root->GetDocLoaderObserver(getter_AddRefs(dlObserver)); } else {