Remove the multiple-parameter versions of nsRenderingContext::SetFont. (Bug 678671, patch 5) r=roc

This changes the only remaining callers (in nsMathMLChar) to pass the
correct language, which they were not previously doing, which should
improve the correctness of font selection and also reduce the number of
unique font metrics objects requested (which helps nsFontCache
effectiveness).  Those callers, however, remain the odd font users
within all of layout.

Author: dbaron

gfx/src/nsRenderingContext.cpp

@@ -454,22 +454,6 @@ nsRenderingContext::SetTextRunRTL(PRBool aIsRTL)
     mFontMetrics->SetTextRunRTL(aIsRTL);
 }
 
-void
-nsRenderingContext::SetFont(const nsFont& aFont, nsIAtom* aLanguage,
-                            gfxUserFontSet *aUserFontSet)
-{
-    mDeviceContext->GetMetricsFor(aFont, aLanguage, aUserFontSet,
-                                  *getter_AddRefs(mFontMetrics));
-}
-
-void
-nsRenderingContext::SetFont(const nsFont& aFont,
-                            gfxUserFontSet *aUserFontSet)
-{
-    mDeviceContext->GetMetricsFor(aFont, nsnull, aUserFontSet,
-                                  *getter_AddRefs(mFontMetrics));
-}
-
 void
 nsRenderingContext::SetFont(nsFontMetrics *aFontMetrics)
 {

gfx/src/nsRenderingContext.h

@@ -117,9 +117,6 @@ class nsRenderingContext
 
     // Text
 
-    void SetFont(const nsFont& aFont, nsIAtom* aLanguage,
-                 gfxUserFontSet *aUserFontSet);
-    void SetFont(const nsFont& aFont, gfxUserFontSet *aUserFontSet);
     void SetFont(nsFontMetrics *aFontMetrics);
     nsFontMetrics *FontMetrics() { return mFontMetrics; } // may be null
 

layout/mathml/nsMathMLChar.cpp

@@ -1042,8 +1042,8 @@ AddFallbackFonts(nsAString& aFontName, const nsAString& aFallbackFamilies)
 
 // Update the font and rendering context if there is a family change
 static void
-SetFontFamily(nsPresContext*       aPresContext,
-              nsRenderingContext& aRenderingContext,
+SetFontFamily(nsStyleContext*      aStyleContext,
+              nsRenderingContext&  aRenderingContext,
               nsFont&              aFont,
               const nsGlyphTable*  aGlyphTable,
               const nsGlyphCode&   aGlyphCode,
@@ -1053,7 +1053,12 @@ SetFontFamily(nsPresContext*       aPresContext,
     aGlyphCode.font ? aGlyphTable->FontNameFor(aGlyphCode) : aDefaultFamily;
   if (! family.Equals(aFont.name)) {
     aFont.name = family;
-    aRenderingContext.SetFont(aFont, aPresContext->GetUserFontSet());
+    nsRefPtr fm;
+    aRenderingContext.DeviceContext()->GetMetricsFor(aFont,
+      aStyleContext->GetStyleVisibility()->mLanguage,
+      aStyleContext->PresContext()->GetUserFontSet(),
+      *getter_AddRefs(fm));
+    aRenderingContext.SetFont(fm);
   }
 }
 
@@ -1119,7 +1124,8 @@ nsMathMLChar::StretchEnumContext::TryVariants(nsGlyphTable*    aGlyphTable,
                                               const nsAString& aFamily)
 {
   // Use our stretchy style context now that stretching is in progress
-  nsFont font = mChar->mStyleContext->GetStyleFont()->mFont;
+  nsStyleContext *sc = mChar->mStyleContext;
+  nsFont font = sc->GetStyleFont()->mFont;
   // Ensure mRenderingContext.SetFont will be called:
   font.name.Truncate();
 
@@ -1144,8 +1150,7 @@ nsMathMLChar::StretchEnumContext::TryVariants(nsGlyphTable*    aGlyphTable,
   nsGlyphCode ch;
   while ((ch = aGlyphTable->BigOf(mPresContext, mChar, size)).Exists()) {
 
-    SetFontFamily(mChar->mStyleContext->PresContext(), mRenderingContext,
-                  font, aGlyphTable, ch, aFamily);
+    SetFontFamily(sc, mRenderingContext, font, aGlyphTable, ch, aFamily);
 
     NS_ASSERTION(maxWidth || ch.code[0] != mChar->mGlyph.code[0] ||
                  ch.code[1] != mChar->mGlyph.code[1] ||
@@ -1269,7 +1274,7 @@ nsMathMLChar::StretchEnumContext::TryParts(nsGlyphTable*    aGlyphTable,
       sizedata[i] = mTargetSize;
     }
     else {
-      SetFontFamily(mChar->mStyleContext->PresContext(), mRenderingContext,
+      SetFontFamily(mChar->mStyleContext, mRenderingContext,
                     font, aGlyphTable, ch, aFamily);
       nsBoundingMetrics bm = mRenderingContext.GetBoundingMetrics(ch.code,
                                                                   ch.Length());
@@ -1460,7 +1465,11 @@ nsMathMLChar::StretchInternal(nsPresContext*           aPresContext,
     mFamily = families;
   }
 
-  aRenderingContext.SetFont(font, aPresContext->GetUserFontSet());
+  nsRefPtr fm;
+  aRenderingContext.DeviceContext()->GetMetricsFor(font,
+    mStyleContext->GetStyleVisibility()->mLanguage,
+    aPresContext->GetUserFontSet(), *getter_AddRefs(fm));
+  aRenderingContext.SetFont(fm);
   aDesiredStretchSize =
     aRenderingContext.GetBoundingMetrics(mData.get(), PRUint32(mData.Length()));
 
@@ -2056,7 +2065,12 @@ nsMathMLChar::PaintForeground(nsPresContext* aPresContext,
   if (! mFamily.IsEmpty()) {
     theFont.name = mFamily;
   }
-  aRenderingContext.SetFont(theFont, aPresContext->GetUserFontSet());
+  nsRefPtr fm;
+  aRenderingContext.DeviceContext()->GetMetricsFor(theFont,
+    styleContext->GetStyleVisibility()->mLanguage,
+    aPresContext->GetUserFontSet(),
+    *getter_AddRefs(fm));
+  aRenderingContext.SetFont(fm);
 
   aRenderingContext.PushState();
   nsRect r = mRect + aPt;
@@ -2165,7 +2179,7 @@ nsMathMLChar::PaintVertically(nsPresContext*      aPresContext,
     if (!ch.Exists()) ch = chGlue;
     // if (!ch.Exists()) glue is null, leave bounding metrics at 0
     if (ch.Exists()) {
-      SetFontFamily(aPresContext, aRenderingContext,
+      SetFontFamily(aStyleContext, aRenderingContext,
                     aFont, aGlyphTable, ch, mFamily);
       bmdata[i] = aRenderingContext.GetBoundingMetrics(ch.code, ch.Length());
     }
@@ -2250,7 +2264,7 @@ nsMathMLChar::PaintVertically(nsPresContext*      aPresContext,
       }
       if (!clipRect.IsEmpty()) {
         AutoPushClipRect clip(aRenderingContext, clipRect);
-        SetFontFamily(aPresContext, aRenderingContext,
+        SetFontFamily(aStyleContext, aRenderingContext,
                       aFont, aGlyphTable, ch, mFamily);
         aRenderingContext.DrawString(ch.code, ch.Length(), dx, dy);
       }
@@ -2307,7 +2321,7 @@ nsMathMLChar::PaintVertically(nsPresContext*      aPresContext,
       bm.descent -= oneDevPixel;
     }
 
-    SetFontFamily(aPresContext, aRenderingContext,
+    SetFontFamily(aStyleContext, aRenderingContext,
                   aFont, aGlyphTable, chGlue, mFamily);
     nsRect clipRect = unionRect;
 
@@ -2393,7 +2407,7 @@ nsMathMLChar::PaintHorizontally(nsPresContext*      aPresContext,
     if (!ch.Exists()) ch = chGlue;
     // if (!ch.Exists()) glue is null, leave bounding metrics at 0.
     if (ch.Exists()) {
-      SetFontFamily(aPresContext, aRenderingContext,
+      SetFontFamily(aStyleContext, aRenderingContext,
                     aFont, aGlyphTable, ch, mFamily);
       bmdata[i] = aRenderingContext.GetBoundingMetrics(ch.code, ch.Length());
     }
@@ -2473,7 +2487,7 @@ nsMathMLChar::PaintHorizontally(nsPresContext*      aPresContext,
       }
       if (!clipRect.IsEmpty()) {
         AutoPushClipRect clip(aRenderingContext, clipRect);
-        SetFontFamily(aPresContext, aRenderingContext,
+        SetFontFamily(aStyleContext, aRenderingContext,
                       aFont, aGlyphTable, ch, mFamily);
         aRenderingContext.DrawString(ch.code, ch.Length(), dx, dy);
       }
@@ -2529,7 +2543,7 @@ nsMathMLChar::PaintHorizontally(nsPresContext*      aPresContext,
       bm.rightBearing -= oneDevPixel;
     }
 
-    SetFontFamily(aPresContext, aRenderingContext,
+    SetFontFamily(aStyleContext, aRenderingContext,
                   aFont, aGlyphTable, chGlue, mFamily);
     nsRect clipRect = unionRect;