Fix Windows bustage
☠☠ backed out by c1d7e86a0c65 ☠ ☠
authorRobert O'Callahan <robert@ocallahan.org>
Fri, 16 Jan 2009 21:29:59 +1300
changeset 23796 f34b0b9c368c8e478bd7fd00bbc12a9e8af137d4
parent 23795 c2f1c609bfbd4c0b3a314a5397229ddb9fb93788
child 23797 0a6dd4ba5a3be1079f7385026c73a09d09108330
push id4728
push userrocallahan@mozilla.com
push dateFri, 16 Jan 2009 08:30:12 +0000
treeherdermozilla-central@f34b0b9c368c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
Fix Windows bustage
gfx/thebes/src/gfxWindowsPlatform.cpp
--- a/gfx/thebes/src/gfxWindowsPlatform.cpp
+++ b/gfx/thebes/src/gfxWindowsPlatform.cpp
@@ -173,17 +173,17 @@ gfxWindowsPlatform::HashEnumFunc(nsStrin
     nsRefPtr<FontEntry> aFontEntry = aFontFamily->FindFontEntry(style);
 
     /* skip symbol fonts */
     if (aFontEntry->mSymbolFont)
         return PL_DHASH_NEXT;
 
     if (aFontEntry->SupportsLangGroup(data->mLangGroup) &&
         aFontEntry->MatchesGenericFamily(data->mGenericFamily))
-        data->mStringArray.AppendString(aFontFamily->mName);
+        data->mStringArray.AppendElement(aFontFamily->mName);
 
     return PL_DHASH_NEXT;
 }
 
 nsresult
 gfxWindowsPlatform::GetFontList(const nsACString& aLangGroup,
                                 const nsACString& aGenericFamily,
                                 nsTArray<nsString>& aListOfFonts)
@@ -837,17 +837,18 @@ gfxWindowsPlatform::MakePlatformFont(con
         }
     } else {
         // TrueType-style glyphs, use EOT library
         nsAutoTArray<PRUint8,2048> eotHeader;
         PRUint8 *buffer;
         PRUint32 eotlen;
 
         PRUint32 nameLen = PR_MIN(uniqueName.Length(), LF_FACESIZE - 1);
-        nsPromiseFlatString fontName(Substring(uniqueName, 0, nameLen));
+        nsPromiseFlatString fontName(Substring(uniqueName, 0, nameLen));
+
 
         rv = gfxFontUtils::MakeEOTHeader(aFontData, aLength, &eotHeader);
         if (NS_FAILED(rv))
             return nsnull;
 
         // load in embedded font data
         eotlen = eotHeader.Length();
         buffer = reinterpret_cast<PRUint8*> (eotHeader.Elements());