Correction to typo in checkin for bug 789096. Bug 983691, r=jfkthame

This commit is contained in:
Simon Montagu 2014-03-24 02:23:12 -07:00
parent 544d2c7bcd
commit 27a769cf38
4 changed files with 41 additions and 1 deletions

View File

@ -1945,7 +1945,7 @@ nsLineLayout::BlockDirAlignFrames(PerSpanData* psd)
nscoord parentDescent = fm->MaxDescent();
if (frameSpan) {
pfd->mBounds.BStart(lineWM) = baselineBCoord + parentDescent -
pfd->mBounds.BStart(lineWM) +
pfd->mBounds.BSize(lineWM) +
pfd->mBorderPadding.BEnd(frameWM) -
frameSpan->mBEndLeading;
}

View File

@ -0,0 +1,21 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
@font-face {
src: url(../fonts/Ahem.ttf);
font-family: AhemReftest;
}
span { line-height: 1.0; font-family: AhemReftest; font-size: 30px }
</style>
</head>
<body>
<div>
<span>XXX
<span style="vertical-align:text-bottom">XXX</span>
<span style="vertical-align:text-top">XXX</span>
</span>
</div>
</body>
</html>

View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<style>
@font-face {
src: url(../fonts/Ahem.ttf);
font-family: AhemReftest;
}
span { line-height: 1.0; font-family: AhemReftest; font-size: 30px }
</style>
</head>
<body>
<div>
<span>XXX XXX XXX</span>
</div>
</body>
</html>

View File

@ -1803,3 +1803,4 @@ skip-if(Android) == 966510-2.html 966510-2-ref.html # same as above
== 983084-1.html 983084-1-ref.html
== 983084-2.html 983084-2-ref.html
== 983084-3.html 983084-1-ref.html
== 983691-1.html 983691-ref.html