Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 845524 part 2: Make nsSliderFrame::CurrentPositionChanged() return void instead of nsresult, since it only ever returns NS_OK. r=jwatt

Browse Source
This commit is contained in:
Daniel Holbert 2013-02-27 08:56:00 -08:00
parent 5fd14244c8
commit 4811df24ea
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/xul/base/src/nsSliderFrame.cpp
View File

@ -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) {

2
layout/xul/base/src/nsSliderFrame.h
View File

@ -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();