Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 263825. Make paginated floats work, and other fixes. r+sr=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@171036 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2005-03-23 03:35:08 +00:00
parent b99fcb19b5
commit 7f1a3c9c93
21 changed files with 1350 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/layout/generic/nsLineLayout.cpp
View File

@@ -1012,11 +1012,16 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
nsIFrame* outOfFlowFrame = nsLayoutUtils::GetFloatFromPlaceholder(aFrame);
if (outOfFlowFrame) {
nsPlaceholderFrame* placeholder = NS_STATIC_CAST(nsPlaceholderFrame*, aFrame);
PRBool didPlace;
if (eReflowReason_Incremental == reason) {
InitFloat(placeholder, aReflowStatus);
didPlace = InitFloat(placeholder, aReflowStatus);
}
else {
AddFloat(placeholder, aReflowStatus);
didPlace = AddFloat(placeholder, aReflowStatus);
}
printf("*** Reflowed float, didPlace=%d, status=%d\n", aReflowStatus);
if (!didPlace) {
aReflowStatus = NS_INLINE_LINE_BREAK_BEFORE();
}
if (outOfFlowFrame->GetType() == nsLayoutAtoms::letterFrame) {
SetFlag(LL_FIRSTLETTERSTYLEOK, PR_FALSE);