From 4811df24ea64d132db99b1db6eeccda73e760a05 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 27 Feb 2013 08:56:00 -0800
Subject: [PATCH] Bug 845524 part 2: Make
 nsSliderFrame::CurrentPositionChanged() return void instead of nsresult,
 since it only ever returns NS_OK. r=jwatt

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

diff --git a/layout/xul/base/src/nsSliderFrame.cpp b/layout/xul/base/src/nsSliderFrame.cpp
index 6a43da7851bd..ad820b1dc6db 100644
--- a/layout/xul/base/src/nsSliderFrame.cpp
+++ b/layout/xul/base/src/nsSliderFrame.cpp
@@ -231,10 +231,7 @@ nsSliderFrame::AttributeChanged(int32_t aNameSpaceID,
                                              aModType);
   // if the current position changes
   if (aAttribute == nsGkAtoms::curpos) {
-     rv = CurrentPositionChanged();
-     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to change position");
-     if (NS_FAILED(rv))
-        return rv;
+     CurrentPositionChanged();
   } else if (aAttribute == nsGkAtoms::minpos ||
              aAttribute == nsGkAtoms::maxpos) {
       // bounds check it.
@@ -649,7 +646,7 @@ nsSliderFrame::PageUpDown(nscoord change)
 }
 
 // called when the current position changed and we need to update the thumb's location
-nsresult
+void
 nsSliderFrame::CurrentPositionChanged()
 {
   nsIFrame* scrollbarBox = GetScrollbar();
@@ -661,7 +658,7 @@ nsSliderFrame::CurrentPositionChanged()
 
   // do nothing if the position did not change
   if (mCurPos == curPos)
-      return NS_OK;
+    return;
 
   // get our current min and max position from our content node
   int32_t minPos = GetMinPosition(scrollbar);
@@ -673,7 +670,7 @@ nsSliderFrame::CurrentPositionChanged()
   // get the thumb's rect
   nsIFrame* thumbFrame = mFrames.FirstChild();
   if (!thumbFrame)
-    return NS_OK; // The thumb may stream in asynchronously via XBL.
+    return; // The thumb may stream in asynchronously via XBL.
 
   nsRect thumbRect = thumbFrame->GetRect();
 
@@ -709,8 +706,6 @@ nsSliderFrame::CurrentPositionChanged()
         new nsValueChangedRunnable(sliderListener, nsGkAtoms::curpos, mCurPos, mUserChanged));
     }
   }
-
-  return NS_OK;
 }
 
 static void UpdateAttribute(nsIContent* aScrollbar, nscoord aNewPos, bool aNotify, bool aIsSmooth) {
diff --git a/layout/xul/base/src/nsSliderFrame.h b/layout/xul/base/src/nsSliderFrame.h
index 6adeaf440153..e44ee080d5f4 100644
--- a/layout/xul/base/src/nsSliderFrame.h
+++ b/layout/xul/base/src/nsSliderFrame.h
@@ -134,7 +134,7 @@ private:
   void SetCurrentPosition(nsIContent* aScrollbar, int32_t aNewPos, bool aIsSmooth);
   void SetCurrentPositionInternal(nsIContent* aScrollbar, int32_t pos,
                                   bool aIsSmooth);
-  nsresult CurrentPositionChanged();
+  void CurrentPositionChanged();
 
   void DragThumb(bool aGrabMouseEvents);
   void AddListener();