Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1225018 part 2 - Ensure leading for emphasis marks of text directly inside block. r=jfkthame

Browse Source 
--HG--
extra : source : ec7d4f32bc6ba7c8ea0e0f0441fabbf6f4e15672
This commit is contained in:
Xidorn Quan 2015-12-04 11:58:59 +11:00
parent e0157f6d78
commit c66c20fcbf
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
layout/generic/nsLineLayout.cpp
View File

@ -2323,6 +2323,31 @@ nsLineLayout::VerticalAlignFrames(PerSpanData* psd)
lineWM.IsLineInverted());
nscoord blockEnd = blockStart + minimumLineBSize;
if (mStyleText->HasTextEmphasis()) {
nscoord fontMaxHeight = fm->MaxHeight();
nscoord emphasisHeight = fontMaxHeight / 2;
nscoord delta = fontMaxHeight + emphasisHeight - minimumLineBSize;
if (delta > 0) {
if (minimumLineBSize < fontMaxHeight) {
// If the leadings are negative, fill them first.
nscoord ascent = fm->MaxAscent();
nscoord descent = fm->MaxDescent();
if (lineWM.IsLineInverted()) {
Swap(ascent, descent);
}
blockStart = -ascent;
blockEnd = descent;
delta = emphasisHeight;
}
LogicalSide side = mStyleText->TextEmphasisSide(lineWM);
if (side == eLogicalSideBStart) {
blockStart -= delta;
} else {
blockEnd += delta;
}
}
}
if (blockStart < minBCoord) minBCoord = blockStart;
if (blockEnd > maxBCoord) maxBCoord = blockEnd;