зеркало из https://github.com/mozilla/pjs.git
Bug 740857 - Remove dead code from nsFrame::BoxReflow; r=dbaron
This commit is contained in:
Родитель
4d5aec4078
Коммит
da80d50b47
|
@ -7632,14 +7632,8 @@ nsFrame::BoxReflow(nsBoxLayoutState& aState,
|
||||||
nsBoxLayoutMetrics *metrics = BoxMetrics();
|
nsBoxLayoutMetrics *metrics = BoxMetrics();
|
||||||
nsReflowStatus status = NS_FRAME_COMPLETE;
|
nsReflowStatus status = NS_FRAME_COMPLETE;
|
||||||
|
|
||||||
bool redrawAfterReflow = false;
|
|
||||||
bool redrawNow = false;
|
|
||||||
|
|
||||||
bool needsReflow = NS_SUBTREE_DIRTY(this);
|
bool needsReflow = NS_SUBTREE_DIRTY(this);
|
||||||
|
|
||||||
if (redrawNow)
|
|
||||||
Redraw(aState);
|
|
||||||
|
|
||||||
// if we don't need a reflow then
|
// if we don't need a reflow then
|
||||||
// lets see if we are already that size. Yes? then don't even reflow. We are done.
|
// lets see if we are already that size. Yes? then don't even reflow. We are done.
|
||||||
if (!needsReflow) {
|
if (!needsReflow) {
|
||||||
|
@ -7806,13 +7800,6 @@ nsFrame::BoxReflow(nsBoxLayoutState& aState,
|
||||||
|
|
||||||
NS_ASSERTION(NS_FRAME_IS_COMPLETE(status), "bad status");
|
NS_ASSERTION(NS_FRAME_IS_COMPLETE(status), "bad status");
|
||||||
|
|
||||||
if (redrawAfterReflow) {
|
|
||||||
nsRect r = GetRect();
|
|
||||||
r.width = aDesiredSize.width;
|
|
||||||
r.height = aDesiredSize.height;
|
|
||||||
Redraw(aState, &r);
|
|
||||||
}
|
|
||||||
|
|
||||||
PRUint32 layoutFlags = aState.LayoutFlags();
|
PRUint32 layoutFlags = aState.LayoutFlags();
|
||||||
nsContainerFrame::FinishReflowChild(this, aPresContext, &reflowState,
|
nsContainerFrame::FinishReflowChild(this, aPresContext, &reflowState,
|
||||||
aDesiredSize, aX, aY, layoutFlags | NS_FRAME_NO_MOVE_FRAME);
|
aDesiredSize, aX, aY, layoutFlags | NS_FRAME_NO_MOVE_FRAME);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче