From 3eab71a3f99ed531c842e2151fbc9d08acb9e2c9 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 10 Aug 2004 23:58:56 +0000
Subject: [PATCH] Bug 254586 don't store views in nsCOMPtrs - they are not
 refcounted anyway. r=bzbarsky sr=darin

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

diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index b7f230e0b20..3a9d6420cfc 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -3504,8 +3504,8 @@ nsDocShell::GetCurScrollPos(PRInt32 scrollOrientation, PRInt32 * curPos)
 {
     NS_ENSURE_ARG_POINTER(curPos);
 
-    nsCOMPtr<nsIScrollableView> scrollView;
-    NS_ENSURE_SUCCESS(GetRootScrollableView(getter_AddRefs(scrollView)),
+    nsIScrollableView* scrollView;
+    NS_ENSURE_SUCCESS(GetRootScrollableView(&scrollView),
                       NS_ERROR_FAILURE);
     if (!scrollView) {
         return NS_ERROR_FAILURE;
@@ -3532,8 +3532,8 @@ nsDocShell::GetCurScrollPos(PRInt32 scrollOrientation, PRInt32 * curPos)
 NS_IMETHODIMP
 nsDocShell::SetCurScrollPos(PRInt32 scrollOrientation, PRInt32 curPos)
 {
-    nsCOMPtr<nsIScrollableView> scrollView;
-    NS_ENSURE_SUCCESS(GetRootScrollableView(getter_AddRefs(scrollView)),
+    nsIScrollableView* scrollView;
+    NS_ENSURE_SUCCESS(GetRootScrollableView(&scrollView),
                       NS_ERROR_FAILURE);
     if (!scrollView) {
         return NS_ERROR_FAILURE;
@@ -3570,8 +3570,8 @@ nsDocShell::SetCurScrollPos(PRInt32 scrollOrientation, PRInt32 curPos)
 NS_IMETHODIMP
 nsDocShell::SetCurScrollPosEx(PRInt32 curHorizontalPos, PRInt32 curVerticalPos)
 {
-    nsCOMPtr<nsIScrollableView> scrollView;
-    NS_ENSURE_SUCCESS(GetRootScrollableView(getter_AddRefs(scrollView)),
+    nsIScrollableView* scrollView;
+    NS_ENSURE_SUCCESS(GetRootScrollableView(&scrollView),
                       NS_ERROR_FAILURE);
     if (!scrollView) {
         return NS_ERROR_FAILURE;
@@ -3590,8 +3590,8 @@ nsDocShell::GetScrollRange(PRInt32 scrollOrientation,
 {
     NS_ENSURE_ARG_POINTER(minPos && maxPos);
 
-    nsCOMPtr<nsIScrollableView> scrollView;
-    NS_ENSURE_SUCCESS(GetRootScrollableView(getter_AddRefs(scrollView)),
+    nsIScrollableView* scrollView;
+    NS_ENSURE_SUCCESS(GetRootScrollableView(&scrollView),
                       NS_ERROR_FAILURE);
     if (!scrollView) {
         return NS_ERROR_FAILURE;
@@ -3766,8 +3766,8 @@ NS_IMETHODIMP
 nsDocShell::GetScrollbarVisibility(PRBool * verticalVisible,
                                    PRBool * horizontalVisible)
 {
-    nsCOMPtr<nsIScrollableView> scrollView;
-    NS_ENSURE_SUCCESS(GetRootScrollableView(getter_AddRefs(scrollView)),
+    nsIScrollableView* scrollView;
+    NS_ENSURE_SUCCESS(GetRootScrollableView(&scrollView),
                       NS_ERROR_FAILURE);
     if (!scrollView) {
         return NS_ERROR_FAILURE;
@@ -3795,9 +3795,9 @@ nsDocShell::GetScrollbarVisibility(PRBool * verticalVisible,
 NS_IMETHODIMP
 nsDocShell::ScrollByLines(PRInt32 numLines)
 {
-    nsCOMPtr<nsIScrollableView> scrollView;
+    nsIScrollableView* scrollView;
 
-    NS_ENSURE_SUCCESS(GetRootScrollableView(getter_AddRefs(scrollView)),
+    NS_ENSURE_SUCCESS(GetRootScrollableView(&scrollView),
                       NS_ERROR_FAILURE);
     if (!scrollView) {
         return NS_ERROR_FAILURE;
@@ -3811,9 +3811,9 @@ nsDocShell::ScrollByLines(PRInt32 numLines)
 NS_IMETHODIMP
 nsDocShell::ScrollByPages(PRInt32 numPages)
 {
-    nsCOMPtr<nsIScrollableView> scrollView;
+    nsIScrollableView* scrollView;
 
-    NS_ENSURE_SUCCESS(GetRootScrollableView(getter_AddRefs(scrollView)),
+    NS_ENSURE_SUCCESS(GetRootScrollableView(&scrollView),
                       NS_ERROR_FAILURE);
     if (!scrollView) {
         return NS_ERROR_FAILURE;