Bug 1008917 - part 14, make nsAbsoluteContainingBlock::Reflow() return type 'void'. r=roc

This commit is contained in:
Mats Palmgren 2014-05-13 00:47:53 +00:00
Родитель 6aa57feab6
Коммит ddda9d285c
2 изменённых файлов: 10 добавлений и 11 удалений

Просмотреть файл

@ -108,7 +108,7 @@ nsAbsoluteContainingBlock::RemoveFrame(nsIFrame* aDelegatingFrame,
mAbsoluteFrames.DestroyFrame(aOldFrame);
}
nsresult
void
nsAbsoluteContainingBlock::Reflow(nsContainerFrame* aDelegatingFrame,
nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
@ -193,7 +193,6 @@ nsAbsoluteContainingBlock::Reflow(nsContainerFrame* aDelegatingFrame,
NS_FRAME_SET_OVERFLOW_INCOMPLETE(reflowStatus);
NS_MergeReflowStatusInto(&aReflowStatus, reflowStatus);
return NS_OK;
}
static inline bool IsFixedPaddingSize(const nsStyleCoord& aCoord)

Просмотреть файл

@ -82,15 +82,15 @@ public:
* status of the delegating frame's main reflow. This function merges in the
* statuses of the absolutely positioned children's reflows.
*/
nsresult Reflow(nsContainerFrame* aDelegatingFrame,
nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aReflowStatus,
const nsRect& aContainingBlock,
bool aConstrainHeight,
bool aCBWidthChanged,
bool aCBHeightChanged,
nsOverflowAreas* aOverflowAreas);
void Reflow(nsContainerFrame* aDelegatingFrame,
nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aReflowStatus,
const nsRect& aContainingBlock,
bool aConstrainHeight,
bool aCBWidthChanged,
bool aCBHeightChanged,
nsOverflowAreas* aOverflowAreas);
void DestroyFrames(nsIFrame* aDelegatingFrame,
nsIFrame* aDestructRoot);