From 14f87dddf55a5bb6a93bd18e7a33a2e271a5cbc0 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu"
 <bzbarsky%mit.edu@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 11 Sep 2002 01:42:02 +0000
Subject: [PATCH] views are not refcounted; do not nsCOMPtr them!  Bug 166804,
 r=timeless, sr=roc

git-svn-id: svn://10.0.0.236/trunk@129186 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/events/src/nsDOMEvent.cpp        |  8 ++++----
 mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp | 12 +++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mozilla/content/events/src/nsDOMEvent.cpp b/mozilla/content/events/src/nsDOMEvent.cpp
index c1d8d438486..f5f917ca988 100644
--- a/mozilla/content/events/src/nsDOMEvent.cpp
+++ b/mozilla/content/events/src/nsDOMEvent.cpp
@@ -962,10 +962,10 @@ NS_METHOD nsDOMEvent::GetPageX(PRInt32* aPageX)
 {
   nsresult ret = NS_OK;
   PRInt32 scrollX = 0;
-  nsCOMPtr<nsIScrollableView> view;
+  nsIScrollableView* view = nsnull;
   float p2t, t2p;
 
-  GetScrollInfo(getter_AddRefs(view), &p2t, &t2p);
+  GetScrollInfo(&view, &p2t, &t2p);
   if(view) {
     nscoord xPos, yPos;
     ret = view->GetScrollPosition(xPos, yPos);
@@ -987,10 +987,10 @@ NS_METHOD nsDOMEvent::GetPageY(PRInt32* aPageY)
 {
   nsresult ret = NS_OK;
   PRInt32 scrollY = 0;
-  nsCOMPtr<nsIScrollableView> view;
+  nsIScrollableView* view = nsnull;
   float p2t, t2p;
 
-  GetScrollInfo(getter_AddRefs(view), &p2t, &t2p);
+  GetScrollInfo(&view, &p2t, &t2p);
   if(view) {
     nscoord xPos, yPos;
     ret = view->GetScrollPosition(xPos, yPos);
diff --git a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp
index f31e0ad8410..b3bd6902152 100644
--- a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp
@@ -299,7 +299,7 @@ nsScrollBoxFrame::CreateScrollingView(nsIPresContext* aPresContext)
 
     // Get the nsIScrollableView interface
     nsIScrollableView* scrollingView;
-    view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
+    CallQueryInterface(view, &scrollingView);
 
     scrollingView->SetScrollPreference(nsScrollPreference_kNeverScroll);
 
@@ -439,7 +439,7 @@ nsScrollBoxFrame::DoLayout(nsBoxLayoutState& aState)
   nsIScrollableView* scrollingView;
   nsIView*           view;
   GetView(presContext, &view);
-  if (NS_SUCCEEDED(view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView))) {
+  if (NS_SUCCEEDED(CallQueryInterface(view, &scrollingView))) {
     scrollingView->ComputeScrollOffsets(PR_TRUE);
   }
 
@@ -516,7 +516,8 @@ nsScrollBoxFrame::DoLayout(nsBoxLayoutState& aState)
     if (!view)
       return NS_OK; // don't freak out if we have no view
 
-    nsCOMPtr<nsIScrollableView> scrollingView(do_QueryInterface(view));
+    nsIScrollableView* scrollingView;
+    CallQueryInterface(view, &scrollingView);
     if (scrollingView) {
       nscoord x = 0;
       nscoord y = 0;
@@ -735,7 +736,7 @@ nsScrollBoxFrame::SaveState(nsIPresContext* aPresContext,
 
   PRInt32 x,y;
   nsIScrollableView* scrollingView;
-  res = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
+  res = CallQueryInterface(view, &scrollingView);
   NS_ENSURE_SUCCESS(res, res);
   scrollingView->GetScrollPosition(x,y);
 
@@ -832,7 +833,8 @@ nsScrollBoxFrame::RestoreState(nsIPresContext* aPresContext,
       if (!view)
         return NS_ERROR_FAILURE;
 
-      nsCOMPtr<nsIScrollableView> scrollingView(do_QueryInterface(view));
+      nsIScrollableView* scrollingView;
+      CallQueryInterface(view, &scrollingView);
       if (scrollingView)
         scrollingView->GetScrollPosition(mLastPos.x, mLastPos.y);
     }