bug 56201 - allow cell to return larger desired size than avail during incremental reflow. sr=buster, r=peterl
This commit is contained in:
@@ -876,10 +876,10 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
|
|||||||
|
|
||||||
kidSize.width = PR_MAX(kidSize.width, smallestMinWidth);
|
kidSize.width = PR_MAX(kidSize.width, smallestMinWidth);
|
||||||
|
|
||||||
|
if (eReflowReason_Resize == aReflowState.reason) {
|
||||||
|
NS_ASSERTION(kidSize.width <= availSize.width, "child needed more space during resize reflow");
|
||||||
|
}
|
||||||
// Place the child
|
// Place the child
|
||||||
//////////////////////////////// HACK //////////////////////////////
|
|
||||||
kidSize.width = PR_MIN(kidSize.width, availSize.width);
|
|
||||||
///////////////////////////// END HACK /////////////////////////////
|
|
||||||
FinishReflowChild(firstKid, aPresContext, kidSize,
|
FinishReflowChild(firstKid, aPresContext, kidSize,
|
||||||
kidOrigin.x, kidOrigin.y, 0);
|
kidOrigin.x, kidOrigin.y, 0);
|
||||||
|
|
||||||
|
|||||||
@@ -876,10 +876,10 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
|
|||||||
|
|
||||||
kidSize.width = PR_MAX(kidSize.width, smallestMinWidth);
|
kidSize.width = PR_MAX(kidSize.width, smallestMinWidth);
|
||||||
|
|
||||||
|
if (eReflowReason_Resize == aReflowState.reason) {
|
||||||
|
NS_ASSERTION(kidSize.width <= availSize.width, "child needed more space during resize reflow");
|
||||||
|
}
|
||||||
// Place the child
|
// Place the child
|
||||||
//////////////////////////////// HACK //////////////////////////////
|
|
||||||
kidSize.width = PR_MIN(kidSize.width, availSize.width);
|
|
||||||
///////////////////////////// END HACK /////////////////////////////
|
|
||||||
FinishReflowChild(firstKid, aPresContext, kidSize,
|
FinishReflowChild(firstKid, aPresContext, kidSize,
|
||||||
kidOrigin.x, kidOrigin.y, 0);
|
kidOrigin.x, kidOrigin.y, 0);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user