corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 952827 - Remove unused methods from nsIScrollable. r=roc

Browse Source
This commit is contained in:
Mats Palmgren
2014-01-03 21:08:50 +00:00
parent c03c8ec2ba
commit f3b2efc7f6
6 changed files with 48 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
docshell/base/nsDocShell.cpp
View File

@@ -5796,11 +5796,7 @@ nsDocShell::SetTitle(const PRUnichar * aTitle)
return NS_OK;
}
//*****************************************************************************
// nsDocShell::nsIScrollable
//*****************************************************************************
NS_IMETHODIMP
nsresult
nsDocShell::GetCurScrollPos(int32_t scrollOrientation, int32_t * curPos)
{
NS_ENSURE_ARG_POINTER(curPos);
@@ -5824,32 +5820,7 @@ nsDocShell::GetCurScrollPos(int32_t scrollOrientation, int32_t * curPos)
}
}
NS_IMETHODIMP
nsDocShell::SetCurScrollPos(int32_t scrollOrientation, int32_t curPos)
{
nsIScrollableFrame* sf = GetRootScrollFrame();
NS_ENSURE_TRUE(sf, NS_ERROR_FAILURE);
nsPoint pt = sf->GetScrollPosition();
switch (scrollOrientation) {
case ScrollOrientation_X:
pt.x = curPos;
break;
case ScrollOrientation_Y:
pt.y = curPos;
break;
default:
NS_ENSURE_TRUE(false, NS_ERROR_INVALID_ARG);
}
sf->ScrollTo(pt, nsIScrollableFrame::INSTANT);
return NS_OK;
}
NS_IMETHODIMP
nsresult
nsDocShell::SetCurScrollPosEx(int32_t curHorizontalPos, int32_t curVerticalPos)
{
nsIScrollableFrame* sf = GetRootScrollFrame();
@@ -5860,69 +5831,10 @@ nsDocShell::SetCurScrollPosEx(int32_t curHorizontalPos, int32_t curVerticalPos)
return NS_OK;
}
// XXX This is wrong
NS_IMETHODIMP
nsDocShell::GetScrollRange(int32_t scrollOrientation,
int32_t * minPos, int32_t * maxPos)
{
NS_ENSURE_ARG_POINTER(minPos && maxPos);
//*****************************************************************************
// nsDocShell::nsIScrollable
//*****************************************************************************
nsIScrollableFrame* sf = GetRootScrollFrame();
NS_ENSURE_TRUE(sf, NS_ERROR_FAILURE);
nsSize portSize = sf->GetScrollPortRect().Size();
nsRect range = sf->GetScrollRange();
switch (scrollOrientation) {
case ScrollOrientation_X:
*minPos = range.x;
*maxPos = range.XMost() + portSize.width;
return NS_OK;
case ScrollOrientation_Y:
*minPos = range.y;
*maxPos = range.YMost() + portSize.height;
return NS_OK;
default:
NS_ENSURE_TRUE(false, NS_ERROR_INVALID_ARG);
}
}
NS_IMETHODIMP
nsDocShell::SetScrollRange(int32_t scrollOrientation,
int32_t minPos, int32_t maxPos)
{
//XXX First Check
/*
Retrieves or Sets the valid ranges for the thumb. When maxPos is set to
something less than the current thumb position, curPos is set = to maxPos.
@return NS_OK - Setting or Getting completed successfully.
NS_ERROR_INVALID_ARG - returned when curPos is not within the
minPos and maxPos.
*/
return NS_ERROR_FAILURE;
}
NS_IMETHODIMP
nsDocShell::SetScrollRangeEx(int32_t minHorizontalPos,
int32_t maxHorizontalPos, int32_t minVerticalPos,
int32_t maxVerticalPos)
{
//XXX First Check
/*
Retrieves or Sets the valid ranges for the thumb. When maxPos is set to
something less than the current thumb position, curPos is set = to maxPos.
@return NS_OK - Setting or Getting completed successfully.
NS_ERROR_INVALID_ARG - returned when curPos is not within the
minPos and maxPos.
*/
return NS_ERROR_FAILURE;
}
// This returns setting for all documents in this docshell
NS_IMETHODIMP
nsDocShell::GetDefaultScrollbarPreferences(int32_t scrollOrientation,
int32_t * scrollbarPref)
@@ -5943,15 +5855,6 @@ nsDocShell::GetDefaultScrollbarPreferences(int32_t scrollOrientation,
return NS_ERROR_FAILURE;
}
// Set scrolling preference for all documents in this shell
//
// There are three possible values stored in the shell:
// 1) nsIScrollable::Scrollbar_Never = no scrollbar
// 2) nsIScrollable::Scrollbar_Auto = scrollbar appears if the document
// being displayed would normally have scrollbar
// 3) nsIScrollable::Scrollbar_Always = scrollbar always appears
//
// One important client is nsHTMLFrameInnerFrame::CreateWebShell()
NS_IMETHODIMP
nsDocShell::SetDefaultScrollbarPreferences(int32_t scrollOrientation,
int32_t scrollbarPref)