prevent fixed frames from trying to split reflow roots in print mode b=408602 r+sr=roc a=disicore
authorfantasai.cvs@inkedblade.net
Tue, 22 Apr 2008 10:24:28 -0700
changeset 14547 376a90188b59a8a8c486f0fcef69069e39a630f5
parent 14546 0de4a1cec36d67b73b58c210cf4671fb25f28d91
child 14548 cf9f40391c58f509d6b9626a43e0956ba61a44cc
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdisicore
bugs408602
milestone1.9pre
prevent fixed frames from trying to split reflow roots in print mode b=408602 r+sr=roc a=disicore
layout/generic/nsPageContentFrame.cpp
--- a/layout/generic/nsPageContentFrame.cpp
+++ b/layout/generic/nsPageContentFrame.cpp
@@ -213,20 +213,22 @@ nsPageContentFrame::Reflow(nsPresContext
 
     // Place and size the child
     FinishReflowChild(frame, aPresContext, &kidReflowState, aDesiredSize, 0, 0, 0);
 
     NS_ASSERTION(aPresContext->IsDynamic() || !NS_FRAME_IS_FULLY_COMPLETE(aStatus) ||
                   !frame->GetNextInFlow(), "bad child flow list");
   }
   // Reflow our fixed frames 
-  mFixedContainer.Reflow(this, aPresContext, aReflowState, aStatus,
+  nsReflowStatus fixedStatus = NS_FRAME_COMPLETE;
+  mFixedContainer.Reflow(this, aPresContext, aReflowState, fixedStatus,
                          aReflowState.availableWidth,
                          aReflowState.availableHeight,
                          PR_FALSE, PR_TRUE, PR_TRUE); // XXX could be optimized
+  NS_ASSERTION(NS_FRAME_IS_COMPLETE(fixedStatus), "fixed frames can be truncated, but not incomplete");
 
   // Return our desired size
   aDesiredSize.width = aReflowState.availableWidth;
   if (aReflowState.availableHeight != NS_UNCONSTRAINEDSIZE) {
     aDesiredSize.height = aReflowState.availableHeight;
   }
 
   NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);