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

Queue up a reflow command when yanking floaters so that cases like bug #11389 work properly

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@48701 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-09-22 00:58:58 +00:00
parent 1a717135f0
commit 4bdfb90110
6 changed files with 66 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
mozilla/layout/generic/nsBlockReflowState.cpp
View File

@@ -4368,24 +4368,6 @@ nsBlockFrame::FixParentAndView(nsIPresContext* aPresContext, nsIFrame* aFrame)
}
}
static nsISpaceManager*
FindSpaceManager(nsIFrame* aFrame)
{
nsISpaceManager* spaceManager;
while (aFrame) {
nsIAreaFrame* af;
nsresult rv = aFrame->QueryInterface(kIAreaFrameIID, (void**) &af);
if (NS_SUCCEEDED(rv)) {
af->GetSpaceManager(&spaceManager);
if (spaceManager) {
return spaceManager;
}
}
aFrame->GetParent(&aFrame);
}
return nsnull;
}
NS_IMETHODIMP
nsBlockFrame::RemoveFrame(nsIPresContext& aPresContext,
nsIPresShell& aPresShell,
@@ -4394,18 +4376,17 @@ nsBlockFrame::RemoveFrame(nsIPresContext& aPresContext,
{
nsresult rv = NS_OK;
#ifdef NOISY_REFLOW_REASON
ListTag(stdout);
printf(": remove ");
nsFrame::ListTag(stdout, aOldFrame);
printf("\n");
#endif
if (nsLayoutAtoms::floaterList == aListName) {
// Remove floater from the floater list first
mFloaters.RemoveFrame(aOldFrame);
// Find nearest space-manager and remove the floater from its
// region list
nsCOMPtr<nsISpaceManager> spaceManager =
getter_AddRefs(FindSpaceManager(this));
if (spaceManager) {
spaceManager->RemoveRegion(aOldFrame);
}
// Find which line contains the floater
nsLineBox* line = mLines;
while (nsnull != line) {
@@ -4427,21 +4408,14 @@ nsBlockFrame::RemoveFrame(nsIPresContext& aPresContext,
line->MarkDirty();
line = line->mNext;
}
// We will reflow *after* removing the placeholder (which is done 2nd)
return NS_OK;
}
else if (nsnull != aListName) {
return NS_ERROR_INVALID_ARG;
rv = NS_ERROR_INVALID_ARG;
}
else {
rv = DoRemoveFrame(&aPresContext, aOldFrame);
}
#ifdef NOISY_REFLOW_REASON
ListTag(stdout);
printf(": remove ");
nsFrame::ListTag(stdout, aOldFrame);
printf("\n");
#endif
rv = DoRemoveFrame(&aPresContext, aOldFrame);
if (NS_SUCCEEDED(rv)) {
// Generate reflow command to reflow the dirty lines
nsIReflowCommand* reflowCmd = nsnull;