From ca7d34dbff93118bd347cb034f883835464959c4 Mon Sep 17 00:00:00 2001
From: "reed@reedloden.com" <reed@reedloden.com>
Date: Wed, 13 Feb 2008 02:41:23 -0800
Subject: [PATCH] Bug 416510 - "nsSliderFrame should use nsCOMPtr for its
 mMediator" [p=kayjay@poczta.fm (kayjay) r+sr=roc a1.9=schrep]

---
 layout/xul/base/src/nsSliderFrame.cpp | 5 +----
 layout/xul/base/src/nsSliderFrame.h   | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp
index e73d3beda67e..15c2a7ea866d 100644
--- a/layout/xul/base/src/nsSliderFrame.cpp
+++ b/layout/xul/base/src/nsSliderFrame.cpp
@@ -95,8 +95,7 @@ nsSliderFrame::nsSliderFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
   nsBoxFrame(aPresShell, aContext),
   mCurPos(0),
   mScrollbarListener(nsnull),
-  mChange(0),
-  mMediator(nsnull)
+  mChange(0)
 {
 }
 
@@ -955,7 +954,6 @@ nsSliderFrame::AddListener()
 {
   if (!mMediator) {
     mMediator = new nsSliderMediator(this);
-    NS_ADDREF(mMediator);
   }
 
   nsIFrame* thumbFrame = mFrames.FirstChild();
@@ -1027,7 +1025,6 @@ nsSliderFrame::Destroy()
   // tell our mediator if we have one we are gone.
   if (mMediator) {
     mMediator->SetSlider(nsnull);
-    NS_RELEASE(mMediator);
     mMediator = nsnull;
   }
 
diff --git a/layout/xul/base/src/nsSliderFrame.h b/layout/xul/base/src/nsSliderFrame.h
index f4693be35a21..46c5b9d5c7d6 100644
--- a/layout/xul/base/src/nsSliderFrame.h
+++ b/layout/xul/base/src/nsSliderFrame.h
@@ -242,7 +242,7 @@ private:
 
   nscoord mChange;
   nsPoint mDestinationPoint;
-  nsSliderMediator* mMediator;
+  nsRefPtr<nsSliderMediator> mMediator;
 
   static PRBool gMiddlePref;
   static PRInt32 gSnapMultiplier;