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

harfbuzz shaper should not modify character-clustering info due to diacritic within ligature. Bug 249159, r=smontagu

Browse Source
This commit is contained in:
Jonathan Kew 2012-05-07 12:18:24 -07:00
parent b9713f2189
commit 787945abe1
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/thebes/gfxHarfBuzzShaper.cpp
View File

@ -1187,7 +1187,6 @@ gfxHarfBuzzShaper::SetGlyphsFromRun(gfxContext *aContext,
while (glyphStart < PRInt32(numGlyphs)) {
bool inOrder = true;
PRInt32 charEnd = ginfo[glyphStart].cluster;
PRInt32 glyphEnd = glyphStart;
PRInt32 charLimit = wordLength;
@ -1232,9 +1231,6 @@ gfxHarfBuzzShaper::SetGlyphsFromRun(gfxContext *aContext,
allGlyphsAreWithinCluster = false;
break;
}
if (glyphCharIndex <= prevGlyphCharIndex) {
inOrder = false;
}
prevGlyphCharIndex = glyphCharIndex;
}
if (allGlyphsAreWithinCluster) {
@ -1369,8 +1365,7 @@ gfxHarfBuzzShaper::SetGlyphsFromRun(gfxContext *aContext,
while (++baseCharIndex != endCharIndex &&
baseCharIndex < PRInt32(wordLength)) {
gfxTextRun::CompressedGlyph g;
g.SetComplex(inOrder &&
aShapedWord->IsClusterStart(baseCharIndex),
g.SetComplex(aShapedWord->IsClusterStart(baseCharIndex),
false, 0);
aShapedWord->SetGlyphs(baseCharIndex, g, nsnull);
}