зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1008917 - part 14, make nsAbsoluteContainingBlock::Reflow() return type 'void'. r=roc
This commit is contained in:
Родитель
2e5845b3d5
Коммит
ea578f7f0a
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче