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 12, make nsFrame::WillReflow() return type 'void'. r=roc

Browse Source
This commit is contained in:
Mats Palmgren 2014-05-13 00:47:53 +00:00
parent 39083b6251
commit 60afe18a5c
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/generic/nsFrame.cpp
View File

@ -4267,7 +4267,7 @@ nsFrame::ShrinkWidthToFit(nsRenderingContext *aRenderingContext,
return result;
}
nsresult
void
nsFrame::WillReflow(nsPresContext* aPresContext)
{
#ifdef DEBUG_dbaron_off
@ -4279,7 +4279,6 @@ nsFrame::WillReflow(nsPresContext* aPresContext)
NS_FRAME_TRACE_MSG(NS_FRAME_TRACE_CALLS,
("WillReflow: oldState=%x", mState));
mState |= NS_FRAME_IN_REFLOW;
return NS_OK;
}
void

2
layout/generic/nsFrame.h
View File

@ -295,7 +295,7 @@ public:
nscoord ShrinkWidthToFit(nsRenderingContext *aRenderingContext,
nscoord aWidthInCB);
virtual nsresult WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE;
virtual void WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE;
/**
* Calculates the size of this frame after reflowing (calling Reflow on, and
* updating the size and position of) its children, as necessary. The

2
layout/generic/nsIFrame.h
View File

@ -1820,7 +1820,7 @@ public:
* XXX Is this really the semantics we want? Because we have the NS_FRAME_IN_REFLOW
* bit we can ensure we don't call it more than once...
*/
virtual nsresult WillReflow(nsPresContext* aPresContext) = 0;
virtual void WillReflow(nsPresContext* aPresContext) = 0;
/**
* The frame is given an available size and asked for its desired

4
layout/mathml/nsMathMLContainerFrame.h
View File

@ -112,11 +112,11 @@ public:
const nsHTMLReflowState& aReflowState,
nsReflowStatus& aStatus) MOZ_OVERRIDE;
virtual nsresult
virtual void
WillReflow(nsPresContext* aPresContext) MOZ_OVERRIDE
{
mPresentationData.flags &= ~NS_MATHML_ERROR;
return nsContainerFrame::WillReflow(aPresContext);
nsContainerFrame::WillReflow(aPresContext);
}
virtual void DidReflow(nsPresContext* aPresContext,