From 1498230e1f9e9146eeb1e5a77bd69bb50ae92005 Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 8 Feb 2012 00:56:56 +0000 Subject: [PATCH] Backout 9062b3e04318 (bug 718516) for reftest failures --- layout/generic/crashtests/718516.html | 70 ----------------------- layout/generic/crashtests/crashtests.list | 1 - layout/generic/nsColumnSetFrame.cpp | 5 +- 3 files changed, 1 insertion(+), 75 deletions(-) delete mode 100644 layout/generic/crashtests/718516.html diff --git a/layout/generic/crashtests/718516.html b/layout/generic/crashtests/718516.html deleted file mode 100644 index ed108483ae3..00000000000 --- a/layout/generic/crashtests/718516.html +++ /dev/null @@ -1,70 +0,0 @@ - - - Bug 718516 - - - - A - - - - diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list index 56b3bc9d0a1..93b756523cb 100644 --- a/layout/generic/crashtests/crashtests.list +++ b/layout/generic/crashtests/crashtests.list @@ -384,4 +384,3 @@ load 688996-2.html load 683712.html load text-overflow-bug713610.html load 700031.xhtml -load 718516.html diff --git a/layout/generic/nsColumnSetFrame.cpp b/layout/generic/nsColumnSetFrame.cpp index 39054ce98fe..7e29e102626 100644 --- a/layout/generic/nsColumnSetFrame.cpp +++ b/layout/generic/nsColumnSetFrame.cpp @@ -1083,10 +1083,7 @@ nsColumnSetFrame::Reflow(nsPresContext* aPresContext, CheckInvalidateSizeChange(aDesiredSize); - // XXXjwir3: This call should be replaced with FinishWithAbsoluteFrames - // when bug 724978 is fixed and nsColumnSetFrame is a full absolute - // container. - FinishAndStoreOverflow(&aDesiredSize); + FinishReflowWithAbsoluteFrames(aPresContext, aDesiredSize, aReflowState, aStatus); aDesiredSize.mCarriedOutBottomMargin = carriedOutBottomMargin; NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);