wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1008917 - part 13, make nsContainerFrame::ReflowOverflowContainerChildren() return type 'void'. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2014-05-12 17:40:29 +00:00
parent 1f7d702e60
commit 3d6cc00ad3
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/generic/nsContainerFrame.cpp
View File

@ -1066,7 +1066,7 @@ nsContainerFrame::FinishReflowChild(nsIFrame* aKidFrame,
aKidFrame->DidReflow(aPresContext, aReflowState, nsDidReflowStatus::FINISHED);
}
nsresult
void
nsContainerFrame::ReflowOverflowContainerChildren(nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsOverflowAreas& aOverflowRects,
@ -1112,7 +1112,7 @@ nsContainerFrame::ReflowOverflowContainerChildren(nsPresContext* aPres
}
}
if (!overflowContainers) {
return NS_OK; // nothing to reflow
return; // nothing to reflow
}
nsOverflowContinuationTracker tracker(this, false, false);
@ -1175,7 +1175,9 @@ nsContainerFrame::ReflowOverflowContainerChildren(nsPresContext* aPres
// used to be a normal next-in-flow; steal it from the child list
nsresult rv = static_cast<nsContainerFrame*>(nif->GetParent())
->StealFrame(nif);
NS_ENSURE_SUCCESS(rv, rv);
if (NS_FAILED(rv)) {
return;
}
}
tracker.Insert(nif, frameStatus);
@ -1192,8 +1194,6 @@ nsContainerFrame::ReflowOverflowContainerChildren(nsPresContext* aPres
}
ConsiderChildOverflow(aOverflowRects, frame);
}
return NS_OK;
}
void

10
layout/generic/nsContainerFrame.h
View File

@ -291,11 +291,11 @@ public:
*
* (aFlags just gets passed through to ReflowChild)
*/
nsresult ReflowOverflowContainerChildren(nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsOverflowAreas& aOverflowRects,
uint32_t aFlags,
nsReflowStatus& aStatus);
void ReflowOverflowContainerChildren(nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsOverflowAreas& aOverflowRects,
uint32_t aFlags,
nsReflowStatus& aStatus);
/**
* Move any frames on our overflow list to the end of our principal list.