wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 957128 - Idempotent change to simplify the code a bit. r=smontagu

Browse Source
This commit is contained in:
Mats Palmgren 2014-01-29 14:45:23 +00:00
parent 4ec71bdcab
commit d5721ade20
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gfx/thebes/gfxFont.cpp
View File

@ -6392,15 +6392,17 @@ gfxTextRun::BreakAndMeasureText(uint32_t aStart, uint32_t aMaxLength,
// could be the first and last break opportunity on the line, and that
// would trigger an infinite loop.
if (!aSuppressInitialBreak || i > aStart) {
bool lineBreakHere = mCharacterGlyphs[i].CanBreakBefore() == 1;
bool hyphenation = haveHyphenation && hyphenBuffer[i - bufferStart];
bool atNaturalBreak = mCharacterGlyphs[i].CanBreakBefore() == 1;
bool atHyphenationBreak =
!atNaturalBreak && haveHyphenation && hyphenBuffer[i - bufferStart];
bool atBreak = atNaturalBreak || atHyphenationBreak;
bool wordWrapping =
aCanWordWrap && mCharacterGlyphs[i].IsClusterStart() &&
*aBreakPriority <= gfxBreakPriority::eWordWrapBreak;
if (lineBreakHere || hyphenation || wordWrapping) {
if (atBreak || wordWrapping) {
gfxFloat hyphenatedAdvance = advance;
if (!lineBreakHere && hyphenation) {
if (atHyphenationBreak) {
hyphenatedAdvance += aProvider->GetHyphenWidth();
}
@ -6409,9 +6411,9 @@ gfxTextRun::BreakAndMeasureText(uint32_t aStart, uint32_t aMaxLength,
lastBreak = i;
lastBreakTrimmableChars = trimmableChars;
lastBreakTrimmableAdvance = trimmableAdvance;
lastBreakUsedHyphenation = !lineBreakHere && hyphenation;
*aBreakPriority = hyphenation || lineBreakHere ?
gfxBreakPriority::eNormalBreak : gfxBreakPriority::eWordWrapBreak;
lastBreakUsedHyphenation = atHyphenationBreak;
*aBreakPriority = atBreak ? gfxBreakPriority::eNormalBreak
: gfxBreakPriority::eWordWrapBreak;
}
width += advance;