Make lines with only a bullet take up height. (Bug 179596 / Bug 507187) r=roc

This commit is contained in:
L. David Baron
2009-08-10 19:48:42 -07:00
parent f79c990c18
commit 0f20b4f0a6
6 changed files with 34 additions and 1 deletions

View File

@@ -207,6 +207,10 @@ nsLineLayout::BeginLineReflow(nscoord aX, nscoord aY,
mSpanDepth = 0;
mMaxTopBoxHeight = mMaxBottomBoxHeight = 0;
if (GetFlag(LL_GOTLINEBOX)) {
mLineBox->ClearHasBullet();
}
PerSpanData* psd;
NewPerSpanData(&psd);
mCurrentSpan = mRootSpan = psd;
@@ -1327,8 +1331,10 @@ nsLineLayout::AddBulletFrame(nsIFrame* aFrame,
const nsHTMLReflowMetrics& aMetrics)
{
NS_ASSERTION(mCurrentSpan == mRootSpan, "bad linelayout user");
NS_ASSERTION(GetFlag(LL_GOTLINEBOX), "must have line box");
SetFlag(LL_HASBULLET, PR_TRUE);
mLineBox->SetHasBullet();
PerFrameData* pfd;
nsresult rv = NewPerFrameData(&pfd);