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

Collapse trailing whitespace even if there is a placeholder after it. Bug

Browse Source 
233451, r+sr=dbaron


git-svn-id: svn://10.0.0.236/trunk@152533 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-02-09 01:01:06 +00:00
parent 896834858e
commit e94a4a8364
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1040,6 +1040,7 @@ nsLineLayout::ReflowFrame(nsIFrame* aFrame,
// the float.
if (frameType) {
if (nsLayoutAtoms::placeholderFrame == frameType) {
pfd->SetFlag(PFD_ISPLACEHOLDERFRAME, PR_TRUE);
nsIFrame* outOfFlowFrame = ((nsPlaceholderFrame*)aFrame)->GetOutOfFlowFrame();
if (outOfFlowFrame) {
// Make sure it's floated and not absolutely positioned
@@ -2642,9 +2643,10 @@ nsLineLayout::TrimTrailingWhiteSpaceIn(PerSpanData* psd,
return PR_TRUE;
}
}
else if (!pfd->GetFlag(PFD_ISTEXTFRAME)) {
// If we hit a frame on the end that's not text, then there is
// no trailing whitespace to trim. Stop the search.
else if (!pfd->GetFlag(PFD_ISTEXTFRAME) &&
!pfd->GetFlag(PFD_ISPLACEHOLDERFRAME)) {
// If we hit a frame on the end that's not text and not a placeholder,
// then there is no trailing whitespace to trim. Stop the search.
*aDeltaWidth = 0;
return PR_TRUE;
}