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); mAbsoluteFrames.DestroyFrame(aOldFrame);
} }
nsresult void
nsAbsoluteContainingBlock::Reflow(nsContainerFrame* aDelegatingFrame, nsAbsoluteContainingBlock::Reflow(nsContainerFrame* aDelegatingFrame,
nsPresContext* aPresContext, nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,
@ -193,7 +193,6 @@ nsAbsoluteContainingBlock::Reflow(nsContainerFrame* aDelegatingFrame,
NS_FRAME_SET_OVERFLOW_INCOMPLETE(reflowStatus); NS_FRAME_SET_OVERFLOW_INCOMPLETE(reflowStatus);
NS_MergeReflowStatusInto(&aReflowStatus, reflowStatus); NS_MergeReflowStatusInto(&aReflowStatus, reflowStatus);
return NS_OK;
} }
static inline bool IsFixedPaddingSize(const nsStyleCoord& aCoord) 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 * status of the delegating frame's main reflow. This function merges in the
* statuses of the absolutely positioned children's reflows. * statuses of the absolutely positioned children's reflows.
*/ */
nsresult Reflow(nsContainerFrame* aDelegatingFrame, void Reflow(nsContainerFrame* aDelegatingFrame,
nsPresContext* aPresContext, nsPresContext* aPresContext,
const nsHTMLReflowState& aReflowState, const nsHTMLReflowState& aReflowState,
nsReflowStatus& aReflowStatus, nsReflowStatus& aReflowStatus,
const nsRect& aContainingBlock, const nsRect& aContainingBlock,
bool aConstrainHeight, bool aConstrainHeight,
bool aCBWidthChanged, bool aCBWidthChanged,
bool aCBHeightChanged, bool aCBHeightChanged,
nsOverflowAreas* aOverflowAreas); nsOverflowAreas* aOverflowAreas);
void DestroyFrames(nsIFrame* aDelegatingFrame, void DestroyFrames(nsIFrame* aDelegatingFrame,
nsIFrame* aDestructRoot); nsIFrame* aDestructRoot);