Bug 382206. Ensure that the clip rectangle used to draw partial ligatures is pixel-aligned. Also fix an off-by-one error that busted the detection of the end of a ligature. r=pavlov

gfx/thebes/src/gfxFont.cpp

@@ -985,7 +985,7 @@ gfxTextRun::DrawPartialLigature(gfxFont *aFont, gfxContext *aCtx, PRUint32 aOffs
         // before-spacing.
         widthBeforeCluster = 0;
     }
-    if (aOffset < data.mEndOffset) {
+    if (aOffset < data.mEndOffset - 1) {
         // Not the end of the ligature; need to clip the ligature after the current cluster
         gfxFloat endEdge = aPt->x + clusterWidth;
         if (IsRightToLeft()) {
@@ -999,12 +999,15 @@ gfxTextRun::DrawPartialLigature(gfxFont *aFont, gfxContext *aCtx, PRUint32 aOffs
     }
 
     aCtx->Save();
+    aCtx->NewPath();
     // use division here to ensure that when the rect is aligned on multiples
-    // of mAppUnitsPerDevUnit, we clip to true device unit boundaries
+    // of mAppUnitsPerDevUnit, we clip to true device unit boundaries.
-    aCtx->Clip(gfxRect(left/mAppUnitsPerDevUnit,
+    // Also, make sure we snap the rectangle to device pixels.
-                       aDirtyRect->Y()/mAppUnitsPerDevUnit,
+    aCtx->Rectangle(gfxRect(left/mAppUnitsPerDevUnit,
-                       (right - left)/mAppUnitsPerDevUnit,
+                            aDirtyRect->Y()/mAppUnitsPerDevUnit,
-                       aDirtyRect->Height()/mAppUnitsPerDevUnit));
+                            (right - left)/mAppUnitsPerDevUnit,
+                            aDirtyRect->Height()/mAppUnitsPerDevUnit), PR_TRUE);
+    aCtx->Clip();
     gfxPoint pt(aPt->x - direction*widthBeforeCluster, aPt->y);
     DrawGlyphs(aFont, aCtx, PR_FALSE, &pt, data.mStartOffset,
                data.mEndOffset, aProvider);