Bug 833169 - fixup idents and trim out redundant initialization. r=karlt
authorJohn Daggett <jdaggett@mozilla.com>
Mon, 18 Feb 2013 14:19:40 +0900
changeset 132865 e0ffe719035b6aba48c9fa79303284a8509d1086
parent 132864 eb1a14e09f50df22978eea54caf2bf9887821e7a
child 132866 761d4d55680d50700e4aef7ae7419c329d9ec9c6
push id317
push userbbajaj@mozilla.com
push dateTue, 07 May 2013 01:20:33 +0000
treeherdermozilla-release@159a10910249 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs833169
milestone21.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 833169 - fixup idents and trim out redundant initialization. r=karlt
gfx/thebes/gfxPangoFonts.cpp
layout/mathml/nsMathMLChar.cpp
--- a/gfx/thebes/gfxPangoFonts.cpp
+++ b/gfx/thebes/gfxPangoFonts.cpp
@@ -387,17 +387,16 @@ class gfxUserFcFontEntry : public gfxFcF
 protected:
     gfxUserFcFontEntry(const gfxProxyFontEntry &aProxyEntry)
         : gfxFcFontEntry(aProxyEntry.Name())
     {
         mItalic = aProxyEntry.mItalic;
         mWeight = aProxyEntry.mWeight;
         mStretch = aProxyEntry.mStretch;
         mIsUserFont = true;
-        mFamilyName = aProxyEntry.mFamilyName;
     }
 
     // Helper function to change a pattern so that it matches the CSS style
     // descriptors and so gets properly sorted in font selection.  This also
     // avoids synthetic style effects being added by the renderer when the
     // style of the font itself does not match the descriptor provided by the
     // author.
     void AdjustPatternToCSS(FcPattern *aPattern);
--- a/layout/mathml/nsMathMLChar.cpp
+++ b/layout/mathml/nsMathMLChar.cpp
@@ -921,18 +921,18 @@ SetFontFamily(nsStyleContext*      aStyl
     nsRefPtr<nsFontMetrics> fm;
     aRenderingContext.DeviceContext()->GetMetricsFor(font,
       aStyleContext->StyleFont()->mLanguage,
       aStyleContext->PresContext()->GetUserFontSet(),
       *getter_AddRefs(fm));
     // Set the font if it is an unicode table
     // or if the same family name has been found
     if (aGlyphTable == &gGlyphTableList->mUnicodeTable ||
-      fm->GetThebesFontGroup()->GetFontAt(0)->GetFontEntry()->
-      FamilyName() == family) {
+        fm->GetThebesFontGroup()->GetFontAt(0)->GetFontEntry()->
+        FamilyName() == family) {
       aFont.name = family;
       aRenderingContext.SetFont(fm);
     } else {
       return false; // We did not set the font
     }
   }
   return true;
 }