зеркало из https://github.com/mozilla/gecko-dev.git
b=449356 remove accidentally added code
This commit is contained in:
Родитель
500da2bc8d
Коммит
06263ce5f7
|
@ -1536,19 +1536,6 @@ public:
|
||||||
|
|
||||||
const gfxFontStyle *GetStyle() const { return &mStyle; }
|
const gfxFontStyle *GetStyle() const { return &mStyle; }
|
||||||
|
|
||||||
#if !MOZ_WIDGET_GTK2
|
|
||||||
#error "don't bother building"
|
|
||||||
#endif
|
|
||||||
#if 0
|
|
||||||
virtual const gfxFont::Metrics& GetMetrics() const {
|
|
||||||
gfxFont *firstFont = GetFontAt(0);
|
|
||||||
if (!firstFont) // OOM
|
|
||||||
return gfxFont::Metrics();
|
|
||||||
return firstFont->GetMetrics();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Used in nsTextRunTransformations: rename to GetSimilar
|
|
||||||
virtual gfxFontGroup *Copy(const gfxFontStyle *aStyle) = 0;
|
virtual gfxFontGroup *Copy(const gfxFontStyle *aStyle) = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -261,30 +261,6 @@ gfxFontconfigUtils::gfxFontconfigUtils()
|
||||||
UpdateFontListInternal();
|
UpdateFontListInternal();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
PR_STATIC_CALLBACK(PLDHashOperator)
|
|
||||||
GetFamilyNamesCallback(FamilyHashEntry *aEntry, void *aData)
|
|
||||||
{
|
|
||||||
nsStringArray *names = static_cast<nsStringArray *>(aData);
|
|
||||||
|
|
||||||
const FcChar8 *name = aEntry->GetName();
|
|
||||||
|
|
||||||
// XXXkt only want to return entries for which GetStandardFamilyName
|
|
||||||
// returns the same family.
|
|
||||||
names.AppendString(NS_ConvertUTF8toUTF16(ToCString(sname)));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (aLangGroup.IsEmpty()) {
|
|
||||||
nsresult rv = UpdateFontListInternal();
|
|
||||||
if (NS_FAILED(rv))
|
|
||||||
return rv;
|
|
||||||
|
|
||||||
mFonts.EnumerateEntries(GetFamilyNamesCallback, &aListOfFonts);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
gfxFontconfigUtils::GetFontList(const nsACString& aLangGroup,
|
gfxFontconfigUtils::GetFontList(const nsACString& aLangGroup,
|
||||||
const nsACString& aGenericFamily,
|
const nsACString& aGenericFamily,
|
||||||
|
@ -648,7 +624,6 @@ gfxFontconfigUtils::GetStandardFamilyName(const nsAString& aFontName, nsAString&
|
||||||
if (!IsExistingFamily(fontname))
|
if (!IsExistingFamily(fontname))
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
||||||
// XXXkt this could use mFontsByFamily.GetEntry()
|
|
||||||
FcPattern *pat = NULL;
|
FcPattern *pat = NULL;
|
||||||
FcObjectSet *os = NULL;
|
FcObjectSet *os = NULL;
|
||||||
FcFontSet *givenFS = NULL;
|
FcFontSet *givenFS = NULL;
|
||||||
|
|
|
@ -525,11 +525,6 @@ GetFontGroup(PangoContext *aContext)
|
||||||
* (fontconfig cache data) and (when needed) PangoFonts.
|
* (fontconfig cache data) and (when needed) PangoFonts.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if 0
|
|
||||||
static int font_sets = 0;
|
|
||||||
static int max_font_sets = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
class gfxFcPangoFontSet {
|
class gfxFcPangoFontSet {
|
||||||
public:
|
public:
|
||||||
THEBES_INLINE_DECL_REFCOUNTING(gfxFcPangoFontSet)
|
THEBES_INLINE_DECL_REFCOUNTING(gfxFcPangoFontSet)
|
||||||
|
@ -539,24 +534,6 @@ public:
|
||||||
mFcFontSet(SortPreferredFonts()), mFcFontsTrimmed(0),
|
mFcFontSet(SortPreferredFonts()), mFcFontsTrimmed(0),
|
||||||
mHaveFallbackFonts(PR_FALSE)
|
mHaveFallbackFonts(PR_FALSE)
|
||||||
{
|
{
|
||||||
#if 0
|
|
||||||
++font_sets;
|
|
||||||
if (font_sets > max_font_sets) {
|
|
||||||
max_font_sets = font_sets;
|
|
||||||
fprintf(stderr, "font sets: %i\n", font_sets);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
~gfxFcPangoFontSet()
|
|
||||||
{
|
|
||||||
#if 0
|
|
||||||
--font_sets;
|
|
||||||
#endif
|
|
||||||
PRInt32 last = mFonts.Length() - 1;
|
|
||||||
for (; last >= 0 && !mFonts[last].mFont; --last) ;
|
|
||||||
fprintf(stderr, "patterns/fonts allocated: %i/%i\n",
|
|
||||||
mFonts.Length(), last + 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// A reference is held by the FontSet.
|
// A reference is held by the FontSet.
|
||||||
|
@ -1539,9 +1516,6 @@ gfxPangoFontGroup::Shutdown()
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_IF_RELEASE(gLangService);
|
NS_IF_RELEASE(gLangService);
|
||||||
#if 0
|
|
||||||
fprintf(stderr, "font sets: %i\n", font_sets);
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static double
|
static double
|
||||||
|
|
Загрузка…
Ссылка в новой задаче