Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 05:48:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some bad code that was updating list position incorrectly when going from outside to inside. b=59086, r=karnaze@netscape.com sr=waterson@netscape.com

Browse Source
This commit is contained in:
attinasi%netscape.com 2001-04-09 23:13:31 +00:00
parent ed726cd791
commit d2b3403863
6 changed files with 156 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
layout/generic/nsBlockFrame.cpp
View File

@ -2511,12 +2511,33 @@ nsBlockFrame::UpdateBulletPosition(nsBlockReflowState& aState)
if (mBullet && HaveOutsideBullet()) {
// We now have an inside bullet, but used to have an outside
// bullet. Adjust the frame line list
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
if (mLines) {
// if we have a line already, then move the bullet to the front of the
// first line
nsIFrame* child = nsnull;
#ifdef DEBUG
// bullet should not have any siblings if it was an outside bullet
nsIFrame* next = nsnull;
mBullet->GetNextSibling(&next);
NS_ASSERTION(!next, "outside bullet should not have siblings");
#endif
// move bullet to front and chain the previous frames, and update the line count
child = mLines->mFirstChild;
mLines->mFirstChild = mBullet;
mBullet->SetNextSibling(child);
PRInt32 count = mLines->GetChildCount();
mLines->SetChildCount(count+1);
// dirty it here in case the caller does not
mLines->MarkDirty();
} else {
// no prior lines, just create a new line for the bullet
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
}
mLines = line;
}
line->mNext = mLines;
mLines = line;
}
mState &= ~NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET;
}

31
layout/generic/nsBlockReflowState.cpp
View File

@ -2511,12 +2511,33 @@ nsBlockFrame::UpdateBulletPosition(nsBlockReflowState& aState)
if (mBullet && HaveOutsideBullet()) {
// We now have an inside bullet, but used to have an outside
// bullet. Adjust the frame line list
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
if (mLines) {
// if we have a line already, then move the bullet to the front of the
// first line
nsIFrame* child = nsnull;
#ifdef DEBUG
// bullet should not have any siblings if it was an outside bullet
nsIFrame* next = nsnull;
mBullet->GetNextSibling(&next);
NS_ASSERTION(!next, "outside bullet should not have siblings");
#endif
// move bullet to front and chain the previous frames, and update the line count
child = mLines->mFirstChild;
mLines->mFirstChild = mBullet;
mBullet->SetNextSibling(child);
PRInt32 count = mLines->GetChildCount();
mLines->SetChildCount(count+1);
// dirty it here in case the caller does not
mLines->MarkDirty();
} else {
// no prior lines, just create a new line for the bullet
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
}
mLines = line;
}
line->mNext = mLines;
mLines = line;
}
mState &= ~NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET;
}

31
layout/generic/nsBlockReflowState.h
View File

@ -2511,12 +2511,33 @@ nsBlockFrame::UpdateBulletPosition(nsBlockReflowState& aState)
if (mBullet && HaveOutsideBullet()) {
// We now have an inside bullet, but used to have an outside
// bullet. Adjust the frame line list
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
if (mLines) {
// if we have a line already, then move the bullet to the front of the
// first line
nsIFrame* child = nsnull;
#ifdef DEBUG
// bullet should not have any siblings if it was an outside bullet
nsIFrame* next = nsnull;
mBullet->GetNextSibling(&next);
NS_ASSERTION(!next, "outside bullet should not have siblings");
#endif
// move bullet to front and chain the previous frames, and update the line count
child = mLines->mFirstChild;
mLines->mFirstChild = mBullet;
mBullet->SetNextSibling(child);
PRInt32 count = mLines->GetChildCount();
mLines->SetChildCount(count+1);
// dirty it here in case the caller does not
mLines->MarkDirty();
} else {
// no prior lines, just create a new line for the bullet
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
}
mLines = line;
}
line->mNext = mLines;
mLines = line;
}
mState &= ~NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET;
}

31
layout/html/base/src/nsBlockFrame.cpp
View File

@ -2511,12 +2511,33 @@ nsBlockFrame::UpdateBulletPosition(nsBlockReflowState& aState)
if (mBullet && HaveOutsideBullet()) {
// We now have an inside bullet, but used to have an outside
// bullet. Adjust the frame line list
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
if (mLines) {
// if we have a line already, then move the bullet to the front of the
// first line
nsIFrame* child = nsnull;
#ifdef DEBUG
// bullet should not have any siblings if it was an outside bullet
nsIFrame* next = nsnull;
mBullet->GetNextSibling(&next);
NS_ASSERTION(!next, "outside bullet should not have siblings");
#endif
// move bullet to front and chain the previous frames, and update the line count
child = mLines->mFirstChild;
mLines->mFirstChild = mBullet;
mBullet->SetNextSibling(child);
PRInt32 count = mLines->GetChildCount();
mLines->SetChildCount(count+1);
// dirty it here in case the caller does not
mLines->MarkDirty();
} else {
// no prior lines, just create a new line for the bullet
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
}
mLines = line;
}
line->mNext = mLines;
mLines = line;
}
mState &= ~NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET;
}

31
layout/html/base/src/nsBlockReflowState.cpp
View File

@ -2511,12 +2511,33 @@ nsBlockFrame::UpdateBulletPosition(nsBlockReflowState& aState)
if (mBullet && HaveOutsideBullet()) {
// We now have an inside bullet, but used to have an outside
// bullet. Adjust the frame line list
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
if (mLines) {
// if we have a line already, then move the bullet to the front of the
// first line
nsIFrame* child = nsnull;
#ifdef DEBUG
// bullet should not have any siblings if it was an outside bullet
nsIFrame* next = nsnull;
mBullet->GetNextSibling(&next);
NS_ASSERTION(!next, "outside bullet should not have siblings");
#endif
// move bullet to front and chain the previous frames, and update the line count
child = mLines->mFirstChild;
mLines->mFirstChild = mBullet;
mBullet->SetNextSibling(child);
PRInt32 count = mLines->GetChildCount();
mLines->SetChildCount(count+1);
// dirty it here in case the caller does not
mLines->MarkDirty();
} else {
// no prior lines, just create a new line for the bullet
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
}
mLines = line;
}
line->mNext = mLines;
mLines = line;
}
mState &= ~NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET;
}

31
layout/html/base/src/nsBlockReflowState.h
View File

@ -2511,12 +2511,33 @@ nsBlockFrame::UpdateBulletPosition(nsBlockReflowState& aState)
if (mBullet && HaveOutsideBullet()) {
// We now have an inside bullet, but used to have an outside
// bullet. Adjust the frame line list
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
if (mLines) {
// if we have a line already, then move the bullet to the front of the
// first line
nsIFrame* child = nsnull;
#ifdef DEBUG
// bullet should not have any siblings if it was an outside bullet
nsIFrame* next = nsnull;
mBullet->GetNextSibling(&next);
NS_ASSERTION(!next, "outside bullet should not have siblings");
#endif
// move bullet to front and chain the previous frames, and update the line count
child = mLines->mFirstChild;
mLines->mFirstChild = mBullet;
mBullet->SetNextSibling(child);
PRInt32 count = mLines->GetChildCount();
mLines->SetChildCount(count+1);
// dirty it here in case the caller does not
mLines->MarkDirty();
} else {
// no prior lines, just create a new line for the bullet
nsLineBox* line = aState.NewLineBox(mBullet, 1, PR_FALSE);
if (!line) {
return NS_ERROR_OUT_OF_MEMORY;
}
mLines = line;
}
line->mNext = mLines;
mLines = line;
}
mState &= ~NS_BLOCK_FRAME_HAS_OUTSIDE_BULLET;
}