author | Nathan Froyd <froydnj@mozilla.com> |
Tue, 08 Nov 2011 15:22:04 -0500 | |
changeset 87743 | 3f98fc956d257f86f9e0e37ec98e91eba36e15b1 |
parent 87742 | b85b6482eb6553dadb72fe60fb50dbc2d44c8695 |
child 87744 | 2651ff8e19e98b5484c4c833ebeb62f61bba271c |
push id | 22143 |
push user | philringnalda@gmail.com |
push date | Sun, 26 Feb 2012 23:12:35 +0000 |
treeherder | mozilla-central@b98fc24ac54b [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bas |
bugs | 700659 |
milestone | 13.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
|
gfx/thebes/gfxPlatformFontList.cpp | file | annotate | diff | comparison | revisions | |
gfx/thebes/gfxPlatformFontList.h | file | annotate | diff | comparison | revisions |
--- a/gfx/thebes/gfxPlatformFontList.cpp +++ b/gfx/thebes/gfxPlatformFontList.cpp @@ -276,17 +276,17 @@ void gfxPlatformFontList::LoadBadUnderlineList() { nsAutoTArray<nsString, 10> blacklist; gfxFontUtils::GetPrefsFontList("font.blacklist.underline_offset", blacklist); PRUint32 numFonts = blacklist.Length(); for (PRUint32 i = 0; i < numFonts; i++) { nsAutoString key; GenerateFontListKey(blacklist[i], key); - mBadUnderlineFamilyNames.Put(key); + mBadUnderlineFamilyNames.PutEntry(key); } } bool gfxPlatformFontList::ResolveFontName(const nsAString& aFontName, nsAString& aResolvedFontName) { gfxFontFamily *family = FindFamily(aFontName); if (family) {
--- a/gfx/thebes/gfxPlatformFontList.h +++ b/gfx/thebes/gfxPlatformFontList.h @@ -35,17 +35,17 @@ * * ***** END LICENSE BLOCK ***** */ #ifndef GFXPLATFORMFONTLIST_H_ #define GFXPLATFORMFONTLIST_H_ #include "nsDataHashtable.h" #include "nsRefPtrHashtable.h" -#include "nsHashSets.h" +#include "nsTHashtable.h" #include "gfxFontUtils.h" #include "gfxFont.h" #include "gfxPlatform.h" #include "mozilla/FunctionTimer.h" // gfxPlatformFontList is an abstract class for the global font list on the system; @@ -209,17 +209,17 @@ protected: // when system-wide font lookup fails for a character, cache it to skip future searches gfxSparseBitSet mCodepointsWithNoFonts; // the family to use for U+FFFD fallback, to avoid expensive search every time // on pages with lots of problems nsString mReplacementCharFallbackFamily; - nsStringHashSet mBadUnderlineFamilyNames; + nsTHashtable<nsStringHashKey> mBadUnderlineFamilyNames; // data used as part of the font cmap loading process nsTArray<nsRefPtr<gfxFontFamily> > mFontFamiliesToLoad; PRUint32 mStartIndex; PRUint32 mIncrement; PRUint32 mNumFamilies; };