Bug 1248248 - Don't break glyph run for orientation mismatch before a cluster-extender. r=xidorn

This commit is contained in:
Jonathan Kew 2016-02-15 09:07:53 +00:00
parent 4873ef84d6
commit 3896979b98
2 changed files with 4 additions and 3 deletions

View File

@ -2968,10 +2968,11 @@ void gfxFontGroup::ComputeRanges(nsTArray<gfxTextRange>& aRanges,
lastRangeIndex++;
prevFont = font;
} else {
// if font has changed, make a new range
// if font or orientation has changed, make a new range...
// unless ch is a variation selector (bug 1248248)
gfxTextRange& prevRange = aRanges[lastRangeIndex];
if (prevRange.font != font || prevRange.matchType != matchType ||
prevRange.orientation != orient) {
(prevRange.orientation != orient && !IsClusterExtender(ch))) {
// close out the previous range
prevRange.end = origI;
aRanges.AppendElement(gfxTextRange(origI, i + 1,

View File

@ -169,7 +169,7 @@ fuzzy-if(gtkWidget||B2G,255,6) fuzzy-if(cocoaWidget,65,69) == 1193519-sideways-l
== 1243125-1-floats-overflowing.html 1243125-1-floats-overflowing-ref.html
fails HTTP(..) == 1248248-1-orientation-break-glyphrun.html 1248248-1-orientation-break-glyphrun-ref.html
HTTP(..) == 1248248-1-orientation-break-glyphrun.html 1248248-1-orientation-break-glyphrun-ref.html
# Suite of tests from Gérard Talbot in bug 1079151
# Frequent Windows 7 load failed: timed out waiting for test to complete (waiting for onload scripts to complete), bug 1167155 and friends