зеркало из https://github.com/mozilla/gecko-dev.git
Bug 654369 - Part 4: Make nsContainerFrame::SetOverflowFrames return void
--HG-- extra : rebase_source : c75b4fd0a730a6d2804287847be735261aef92f0
This commit is contained in:
Родитель
9e9fe434ef
Коммит
30c6a2509c
|
@ -1375,21 +1375,14 @@ nsContainerFrame::DeleteNextInFlowChild(nsPresContext* aPresContext,
|
|||
/**
|
||||
* Set the frames on the overflow list
|
||||
*/
|
||||
nsresult
|
||||
void
|
||||
nsContainerFrame::SetOverflowFrames(nsPresContext* aPresContext,
|
||||
const nsFrameList& aOverflowFrames)
|
||||
{
|
||||
NS_PRECONDITION(aOverflowFrames.NotEmpty(), "Shouldn't be called");
|
||||
nsFrameList* newList = new nsFrameList(aOverflowFrames);
|
||||
if (!newList) {
|
||||
// XXXbz should really destroy the frames here, but callers are holding
|
||||
// pointers to them.... We should switch all callers to framelists, then
|
||||
// audit and do that.
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
aPresContext->PropertyTable()->Set(this, OverflowProperty(), newList);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsFrameList*
|
||||
|
|
|
@ -402,8 +402,8 @@ protected:
|
|||
/**
|
||||
* Set the overflow list. aOverflowFrames must not be an empty list.
|
||||
*/
|
||||
nsresult SetOverflowFrames(nsPresContext* aPresContext,
|
||||
const nsFrameList& aOverflowFrames);
|
||||
void SetOverflowFrames(nsPresContext* aPresContext,
|
||||
const nsFrameList& aOverflowFrames);
|
||||
|
||||
/**
|
||||
* Destroy the overflow list and any frames that are on it.
|
||||
|
|
Загрузка…
Ссылка в новой задаче