mirror of
https://github.com/roytam1/UXP.git
synced 2026-05-26 13:58:49 +00:00
Issue #2191 - Remove as much old fontconfig support as needed for Harfbuzz update.
Based on Mozilla bugs 1119128, 1285533, and 1421964. gfx.font_rendering.fontconfig.fontlist.enabled is no longer available. gfxFontconfigUtils.h still exists, and will be removed in another commit. Just need more research on bug 1385029. Tag #1862
This commit is contained in:
Job Bautista
@@ -18,10 +18,6 @@
|
||||
#include "mozilla/AppUnits.h"
|
||||
#include "mozilla/gfx/2D.h"
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
|
||||
#endif
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::a11y;
|
||||
|
||||
@@ -653,28 +649,14 @@ TextAttrsMgr::FontWeightTextAttr::
|
||||
if (font->IsSyntheticBold())
|
||||
return 700;
|
||||
|
||||
bool useFontEntryWeight = true;
|
||||
|
||||
// Under Linux, when gfxPangoFontGroup code is used,
|
||||
// font->GetStyle()->weight will give the absolute weight requested of the
|
||||
// font face. The gfxPangoFontGroup code uses the gfxFontEntry constructor
|
||||
// which doesn't initialize the weight field.
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
useFontEntryWeight = gfxPlatformGtk::UseFcFontList();
|
||||
#endif
|
||||
|
||||
if (useFontEntryWeight) {
|
||||
// On Windows, font->GetStyle()->weight will give the same weight as
|
||||
// fontEntry->Weight(), the weight of the first font in the font group,
|
||||
// which may not be the weight of the font face used to render the
|
||||
// characters. On Mac, font->GetStyle()->weight will just give the same
|
||||
// number as getComputedStyle(). fontEntry->Weight() will give the weight
|
||||
// of the font face used.
|
||||
gfxFontEntry *fontEntry = font->GetFontEntry();
|
||||
return fontEntry->Weight();
|
||||
} else {
|
||||
return font->GetStyle()->weight;
|
||||
}
|
||||
// On Windows, font->GetStyle()->weight will give the same weight as
|
||||
// fontEntry->Weight(), the weight of the first font in the font group,
|
||||
// which may not be the weight of the font face used to render the
|
||||
// characters. On Mac, font->GetStyle()->weight will just give the same
|
||||
// number as getComputedStyle(). fontEntry->Weight() will give the weight
|
||||
// of the font face used.
|
||||
gfxFontEntry *fontEntry = font->GetFontEntry();
|
||||
return fontEntry->Weight();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -18,16 +18,6 @@
|
||||
obj:/lib/libdbus-1.so.3.4.0
|
||||
...
|
||||
}
|
||||
{
|
||||
Bug 793600
|
||||
Memcheck:Leak
|
||||
fun:realloc
|
||||
obj:/usr/lib/libfontconfig.so.1.4.4
|
||||
...
|
||||
fun:FcDefaultSubstitute
|
||||
fun:_ZN17gfxPangoFontGroup11MakeFontSetEP14_PangoLanguagedP9nsAutoRefI10_FcPatternE
|
||||
...
|
||||
}
|
||||
{
|
||||
Bug 794366
|
||||
Memcheck:Leak
|
||||
|
||||
@@ -18,16 +18,6 @@
|
||||
obj:/lib64/libdbus-1.so.3.4.0
|
||||
...
|
||||
}
|
||||
{
|
||||
Bug 793600
|
||||
Memcheck:Leak
|
||||
fun:realloc
|
||||
obj:/usr/lib64/libfontconfig.so.1.4.4
|
||||
...
|
||||
fun:FcDefaultSubstitute
|
||||
fun:_ZN17gfxPangoFontGroup11MakeFontSetEP14_PangoLanguagedP9nsAutoRefI10_FcPatternE
|
||||
...
|
||||
}
|
||||
# Fontconfig is going fancy with its cache structure and that confuses valgrind.
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=8215
|
||||
# https://bugs.freedesktop.org/show_bug.cgi?id=8428
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,124 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef GFX_FONTCONFIG_FONTS_H
|
||||
#define GFX_FONTCONFIG_FONTS_H
|
||||
|
||||
#include "cairo.h"
|
||||
#include "gfxTypes.h"
|
||||
#include "gfxTextRun.h"
|
||||
|
||||
#include "nsAutoRef.h"
|
||||
#include "nsTArray.h"
|
||||
|
||||
#include <pango/pango.h>
|
||||
|
||||
class gfxFcFontSet;
|
||||
class gfxFcFont;
|
||||
typedef struct _FcPattern FcPattern;
|
||||
typedef struct FT_FaceRec_* FT_Face;
|
||||
typedef struct FT_LibraryRec_ *FT_Library;
|
||||
|
||||
class gfxPangoFontGroup : public gfxFontGroup {
|
||||
public:
|
||||
gfxPangoFontGroup(const mozilla::FontFamilyList& aFontFamilyList,
|
||||
const gfxFontStyle *aStyle,
|
||||
gfxUserFontSet *aUserFontSet,
|
||||
gfxFloat aDevToCssSize);
|
||||
virtual ~gfxPangoFontGroup();
|
||||
|
||||
virtual gfxFontGroup *Copy(const gfxFontStyle *aStyle);
|
||||
|
||||
virtual gfxFont* GetFirstValidFont(uint32_t aCh = 0x20);
|
||||
|
||||
virtual void UpdateUserFonts();
|
||||
|
||||
virtual already_AddRefed<gfxFont>
|
||||
FindFontForChar(uint32_t aCh, uint32_t aPrevCh, uint32_t aNextCh,
|
||||
Script aRunScript, gfxFont *aPrevMatchedFont,
|
||||
uint8_t *aMatchType);
|
||||
|
||||
static void Shutdown();
|
||||
|
||||
// Used for @font-face { src: local(); }
|
||||
static gfxFontEntry *NewFontEntry(const nsAString& aFontName,
|
||||
uint16_t aWeight,
|
||||
int16_t aStretch,
|
||||
uint8_t aStyle);
|
||||
// Used for @font-face { src: url(); }
|
||||
static gfxFontEntry *NewFontEntry(const nsAString& aFontName,
|
||||
uint16_t aWeight,
|
||||
int16_t aStretch,
|
||||
uint8_t aStyle,
|
||||
const uint8_t* aFontData,
|
||||
uint32_t aLength);
|
||||
|
||||
private:
|
||||
|
||||
virtual gfxFont *GetFontAt(int32_t i, uint32_t aCh = 0x20);
|
||||
|
||||
// @param aLang [in] language to use for pref fonts and system default font
|
||||
// selection, or nullptr for the language guessed from the
|
||||
// gfxFontStyle.
|
||||
// The FontGroup holds a reference to this set.
|
||||
gfxFcFontSet *GetFontSet(PangoLanguage *aLang = nullptr);
|
||||
|
||||
class FontSetByLangEntry {
|
||||
public:
|
||||
FontSetByLangEntry(PangoLanguage *aLang, gfxFcFontSet *aFontSet);
|
||||
PangoLanguage *mLang;
|
||||
RefPtr<gfxFcFontSet> mFontSet;
|
||||
};
|
||||
// There is only one of entry in this array unless characters from scripts
|
||||
// of other languages are measured.
|
||||
AutoTArray<FontSetByLangEntry,1> mFontSets;
|
||||
|
||||
gfxFloat mSizeAdjustFactor;
|
||||
PangoLanguage *mPangoLanguage;
|
||||
|
||||
// @param aLang [in] language to use for pref fonts and system font
|
||||
// resolution, or nullptr to guess a language from the gfxFontStyle.
|
||||
// @param aMatchPattern [out] if non-nullptr, will return the pattern used.
|
||||
already_AddRefed<gfxFcFontSet>
|
||||
MakeFontSet(PangoLanguage *aLang, gfxFloat aSizeAdjustFactor,
|
||||
nsAutoRef<FcPattern> *aMatchPattern = nullptr);
|
||||
|
||||
gfxFcFontSet *GetBaseFontSet();
|
||||
gfxFcFont *GetBaseFont();
|
||||
|
||||
gfxFloat GetSizeAdjustFactor()
|
||||
{
|
||||
if (mFontSets.Length() == 0)
|
||||
GetBaseFontSet();
|
||||
return mSizeAdjustFactor;
|
||||
}
|
||||
|
||||
// old helper methods from gfxFontGroup, moved here so that those methods
|
||||
// can be revamped without affecting the legacy code here
|
||||
|
||||
// iterate over the fontlist, lookup names and expand generics
|
||||
void EnumerateFontListPFG(nsIAtom *aLanguage, void *aClosure);
|
||||
|
||||
// expand a generic to a list of specific names based on prefs
|
||||
void FindGenericFontsPFG(mozilla::FontFamilyType aGenericType,
|
||||
nsIAtom *aLanguage,
|
||||
void *aClosure);
|
||||
|
||||
// lookup and add a font with a given name (i.e. *not* a generic!)
|
||||
void FindPlatformFontPFG(const nsAString& aName,
|
||||
bool aUseFontSet,
|
||||
void *aClosure);
|
||||
|
||||
static void
|
||||
ResolveGenericFontNamesPFG(mozilla::FontFamilyType aGenericType,
|
||||
nsIAtom *aLanguage,
|
||||
nsTArray<nsString>& aGenericFamilies);
|
||||
|
||||
|
||||
friend class gfxSystemFcFontEntry;
|
||||
static FT_Library GetFTLibrary();
|
||||
};
|
||||
|
||||
#endif /* GFX_FONTCONFIG_FONTS_H */
|
||||
File diff suppressed because it is too large
Load Diff
@@ -8,11 +8,7 @@
|
||||
|
||||
#include "gfxPlatform.h"
|
||||
|
||||
#include "mozilla/MathAlgorithms.h"
|
||||
#include "nsAutoRef.h"
|
||||
#include "nsTArray.h"
|
||||
#include "nsTHashtable.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
#include "gfxFT2FontBase.h"
|
||||
|
||||
#include <fontconfig/fontconfig.h>
|
||||
@@ -40,285 +36,14 @@ public:
|
||||
static void Release(FcCharSet *ptr) { FcCharSetDestroy(ptr); }
|
||||
};
|
||||
|
||||
class gfxIgnoreCaseCStringComparator
|
||||
{
|
||||
public:
|
||||
bool Equals(const nsACString& a, const nsACString& b) const
|
||||
{
|
||||
return nsCString(a).Equals(b, nsCaseInsensitiveCStringComparator());
|
||||
}
|
||||
|
||||
bool LessThan(const nsACString& a, const nsACString& b) const
|
||||
{
|
||||
return a < b;
|
||||
}
|
||||
};
|
||||
|
||||
class gfxFontconfigUtils {
|
||||
public:
|
||||
gfxFontconfigUtils();
|
||||
|
||||
static gfxFontconfigUtils* GetFontconfigUtils() {
|
||||
if (!sUtils)
|
||||
sUtils = new gfxFontconfigUtils();
|
||||
return sUtils;
|
||||
}
|
||||
|
||||
static void Shutdown();
|
||||
|
||||
nsresult GetFontList(nsIAtom *aLangGroup,
|
||||
const nsACString& aGenericFamily,
|
||||
nsTArray<nsString>& aListOfFonts);
|
||||
|
||||
nsresult UpdateFontList();
|
||||
|
||||
nsresult GetStandardFamilyName(const nsAString& aFontName, nsAString& aFamilyName);
|
||||
|
||||
const nsTArray< nsCountedRef<FcPattern> >&
|
||||
GetFontsForFamily(const FcChar8 *aFamilyName);
|
||||
|
||||
const nsTArray< nsCountedRef<FcPattern> >&
|
||||
GetFontsForFullname(const FcChar8 *aFullname);
|
||||
|
||||
// Returns the best support that any font offers for |aLang|.
|
||||
FcLangResult GetBestLangSupport(const FcChar8 *aLang);
|
||||
// Returns the fonts offering this best level of support.
|
||||
const nsTArray< nsCountedRef<FcPattern> >&
|
||||
GetFontsForLang(const FcChar8 *aLang);
|
||||
|
||||
// Retuns the language support for a fontconfig font pattern
|
||||
static FcLangResult GetLangSupport(FcPattern *aFont, const FcChar8 *aLang);
|
||||
|
||||
// Conversions between FcChar8*, which is unsigned char*,
|
||||
// and (signed) char*, that check the type of the argument.
|
||||
static const FcChar8 *ToFcChar8(const char *aCharPtr)
|
||||
{
|
||||
return reinterpret_cast<const FcChar8*>(aCharPtr);
|
||||
}
|
||||
static const FcChar8 *ToFcChar8(const nsCString& aCString)
|
||||
{
|
||||
return ToFcChar8(aCString.get());
|
||||
}
|
||||
static const char *ToCString(const FcChar8 *aChar8Ptr)
|
||||
{
|
||||
return reinterpret_cast<const char*>(aChar8Ptr);
|
||||
}
|
||||
|
||||
static uint8_t FcSlantToThebesStyle(int aFcSlant);
|
||||
static uint8_t GetThebesStyle(FcPattern *aPattern); // slant
|
||||
static uint16_t GetThebesWeight(FcPattern *aPattern);
|
||||
static int16_t GetThebesStretch(FcPattern *aPattern);
|
||||
|
||||
static int GetFcSlant(const gfxFontStyle& aFontStyle);
|
||||
// Returns a precise FC_WEIGHT from |aBaseWeight|,
|
||||
// which is a CSS absolute weight / 100.
|
||||
static int FcWeightForBaseWeight(int8_t aBaseWeight);
|
||||
|
||||
static int FcWidthForThebesStretch(int16_t aStretch);
|
||||
|
||||
static bool GetFullnameFromFamilyAndStyle(FcPattern *aFont,
|
||||
nsACString *aFullname);
|
||||
|
||||
// This doesn't consider which faces exist, and so initializes the pattern
|
||||
// using a guessed weight, and doesn't consider sizeAdjust.
|
||||
static nsReturnRef<FcPattern>
|
||||
NewPattern(const nsTArray<nsString>& aFamilies,
|
||||
const gfxFontStyle& aFontStyle, const char *aLang);
|
||||
|
||||
/**
|
||||
* @param aLangGroup [in] a Mozilla langGroup.
|
||||
* @param aFcLang [out] returns a language suitable for fontconfig
|
||||
* matching |aLangGroup| or an empty string if no match is found.
|
||||
*/
|
||||
static void GetSampleLangForGroup(nsIAtom *aLangGroup,
|
||||
nsACString *aFcLang);
|
||||
|
||||
protected:
|
||||
// Base class for hash table entries with case-insensitive FcChar8
|
||||
// string keys.
|
||||
class FcStrEntryBase : public PLDHashEntryHdr {
|
||||
public:
|
||||
typedef const FcChar8 *KeyType;
|
||||
typedef const FcChar8 *KeyTypePointer;
|
||||
|
||||
static KeyTypePointer KeyToPointer(KeyType aKey) { return aKey; }
|
||||
// Case-insensitive hash.
|
||||
//
|
||||
// fontconfig always ignores case of ASCII characters in family
|
||||
// names and languages, but treatment of whitespace in families is
|
||||
// not consistent. FcFontSort and FcFontMatch ignore whitespace
|
||||
// except for whitespace in the first character, while FcFontList
|
||||
// and config subsitution tests require whitespace to match
|
||||
// exactly. CSS 2.1 implies that whitespace is important in the
|
||||
// font-family property. FcStrCmpIgnoreCase considers whitespace
|
||||
// important.
|
||||
static PLDHashNumber HashKey(const FcChar8 *aKey) {
|
||||
uint32_t hash = 0;
|
||||
for (const FcChar8 *c = aKey; *c != '\0'; ++c) {
|
||||
hash = mozilla::RotateLeft(hash, 3) ^ FcToLower(*c);
|
||||
}
|
||||
return hash;
|
||||
}
|
||||
enum { ALLOW_MEMMOVE = true };
|
||||
};
|
||||
|
||||
public:
|
||||
// Hash entry with a dependent const FcChar8* pointer to an external
|
||||
// string for a key (and no data). The user must ensure that the string
|
||||
// associated with the pointer is not destroyed. This entry type is
|
||||
// useful for family name keys as the family name string is held in the
|
||||
// font pattern.
|
||||
class DepFcStrEntry : public FcStrEntryBase {
|
||||
public:
|
||||
// When constructing a new entry in the hashtable, the key is left
|
||||
// nullptr. The caller of PutEntry() must fill in mKey when nullptr.
|
||||
// This provides a mechanism for the caller of PutEntry() to determine
|
||||
// whether the entry has been initialized.
|
||||
explicit DepFcStrEntry(KeyTypePointer aName)
|
||||
: mKey(nullptr) { }
|
||||
|
||||
DepFcStrEntry(const DepFcStrEntry& toCopy)
|
||||
: mKey(toCopy.mKey) { }
|
||||
|
||||
bool KeyEquals(KeyTypePointer aKey) const {
|
||||
return FcStrCmpIgnoreCase(aKey, mKey) == 0;
|
||||
}
|
||||
|
||||
const FcChar8 *mKey;
|
||||
};
|
||||
|
||||
// Hash entry that uses a copy of an FcChar8 string to store the key.
|
||||
// This entry type is useful for language keys, as languages are usually
|
||||
// not stored as strings in font patterns.
|
||||
class CopiedFcStrEntry : public FcStrEntryBase {
|
||||
public:
|
||||
// When constructing a new entry in the hashtable, the key is void.
|
||||
// The caller of PutEntry() must call InitKey() when IsKeyInitialized()
|
||||
// returns false. This provides a mechanism for the caller of
|
||||
// PutEntry() to determine whether the entry has been initialized.
|
||||
explicit CopiedFcStrEntry(KeyTypePointer aName) {
|
||||
mKey.SetIsVoid(true);
|
||||
}
|
||||
|
||||
CopiedFcStrEntry(const CopiedFcStrEntry& toCopy)
|
||||
: mKey(toCopy.mKey) { }
|
||||
|
||||
bool KeyEquals(KeyTypePointer aKey) const {
|
||||
return FcStrCmpIgnoreCase(aKey, ToFcChar8(mKey)) == 0;
|
||||
}
|
||||
|
||||
bool IsKeyInitialized() { return !mKey.IsVoid(); }
|
||||
void InitKey(const FcChar8* aKey) { mKey.Assign(ToCString(aKey)); }
|
||||
|
||||
private:
|
||||
nsCString mKey;
|
||||
};
|
||||
|
||||
protected:
|
||||
class FontsByFcStrEntry : public DepFcStrEntry {
|
||||
public:
|
||||
explicit FontsByFcStrEntry(KeyTypePointer aName)
|
||||
: DepFcStrEntry(aName) { }
|
||||
|
||||
FontsByFcStrEntry(const FontsByFcStrEntry& toCopy)
|
||||
: DepFcStrEntry(toCopy), mFonts(toCopy.mFonts) { }
|
||||
|
||||
bool AddFont(FcPattern *aFont) {
|
||||
return mFonts.AppendElement(aFont) != nullptr;
|
||||
}
|
||||
const nsTArray< nsCountedRef<FcPattern> >& GetFonts() {
|
||||
return mFonts;
|
||||
}
|
||||
private:
|
||||
nsTArray< nsCountedRef<FcPattern> > mFonts;
|
||||
};
|
||||
|
||||
// FontsByFullnameEntry is similar to FontsByFcStrEntry (used for
|
||||
// mFontsByFamily) except for two differences:
|
||||
//
|
||||
// * The font does not always contain a single string for the fullname, so
|
||||
// the key is sometimes a combination of family and style.
|
||||
//
|
||||
// * There is usually only one font.
|
||||
class FontsByFullnameEntry : public DepFcStrEntry {
|
||||
public:
|
||||
// When constructing a new entry in the hashtable, the key is left
|
||||
// nullptr. The caller of PutEntry() is must fill in mKey when adding
|
||||
// the first font if the key is not derived from the family and style.
|
||||
// If the key is derived from family and style, a font must be added.
|
||||
explicit FontsByFullnameEntry(KeyTypePointer aName)
|
||||
: DepFcStrEntry(aName) { }
|
||||
|
||||
FontsByFullnameEntry(const FontsByFullnameEntry& toCopy)
|
||||
: DepFcStrEntry(toCopy), mFonts(toCopy.mFonts) { }
|
||||
|
||||
bool KeyEquals(KeyTypePointer aKey) const;
|
||||
|
||||
bool AddFont(FcPattern *aFont) {
|
||||
return mFonts.AppendElement(aFont) != nullptr;
|
||||
}
|
||||
const nsTArray< nsCountedRef<FcPattern> >& GetFonts() {
|
||||
return mFonts;
|
||||
}
|
||||
|
||||
// Don't memmove the AutoTArray.
|
||||
enum { ALLOW_MEMMOVE = false };
|
||||
private:
|
||||
// There is usually only one font, but sometimes more.
|
||||
AutoTArray<nsCountedRef<FcPattern>,1> mFonts;
|
||||
};
|
||||
|
||||
class LangSupportEntry : public CopiedFcStrEntry {
|
||||
public:
|
||||
explicit LangSupportEntry(KeyTypePointer aName)
|
||||
: CopiedFcStrEntry(aName) { }
|
||||
|
||||
LangSupportEntry(const LangSupportEntry& toCopy)
|
||||
: CopiedFcStrEntry(toCopy), mSupport(toCopy.mSupport) { }
|
||||
|
||||
FcLangResult mSupport;
|
||||
nsTArray< nsCountedRef<FcPattern> > mFonts;
|
||||
};
|
||||
|
||||
static gfxFontconfigUtils* sUtils;
|
||||
|
||||
bool IsExistingFamily(const nsCString& aFamilyName);
|
||||
|
||||
nsresult GetFontListInternal(nsTArray<nsCString>& aListOfFonts,
|
||||
nsIAtom *aLangGroup);
|
||||
nsresult UpdateFontListInternal(bool aForce = false);
|
||||
|
||||
void AddFullnameEntries();
|
||||
|
||||
LangSupportEntry *GetLangSupportEntry(const FcChar8 *aLang,
|
||||
bool aWithFonts);
|
||||
|
||||
// mFontsByFamily and mFontsByFullname contain entries only for families
|
||||
// and fullnames for which there are fonts.
|
||||
nsTHashtable<FontsByFcStrEntry> mFontsByFamily;
|
||||
nsTHashtable<FontsByFullnameEntry> mFontsByFullname;
|
||||
// mLangSupportTable contains an entry for each language that has been
|
||||
// looked up through GetLangSupportEntry, even when the language is not
|
||||
// supported.
|
||||
nsTHashtable<LangSupportEntry> mLangSupportTable;
|
||||
const nsTArray< nsCountedRef<FcPattern> > mEmptyPatternArray;
|
||||
|
||||
FcConfig *mLastConfig;
|
||||
|
||||
#ifdef MOZ_BUNDLED_FONTS
|
||||
void ActivateBundledFonts();
|
||||
|
||||
nsCString mBundledFontsPath;
|
||||
bool mBundledFontsInitialized;
|
||||
#endif
|
||||
};
|
||||
|
||||
class gfxFontconfigFontBase : public gfxFT2FontBase {
|
||||
public:
|
||||
gfxFontconfigFontBase(cairo_scaled_font_t *aScaledFont,
|
||||
FcPattern *aPattern,
|
||||
gfxFontEntry *aFontEntry,
|
||||
const gfxFontStyle *aFontStyle);
|
||||
const gfxFontStyle *aFontStyle)
|
||||
: gfxFT2FontBase(aScaledFont, aFontEntry, aFontStyle)
|
||||
, mPattern(aPattern) { }
|
||||
|
||||
virtual FontType GetType() const override { return FONT_TYPE_FONTCONFIG; }
|
||||
virtual FcPattern *GetPattern() const { return mPattern; }
|
||||
|
||||
@@ -83,10 +83,6 @@
|
||||
#include "GLContextProvider.h"
|
||||
#include "mozilla/gfx/Logging.h"
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
|
||||
#endif
|
||||
|
||||
#ifdef USE_SKIA
|
||||
# ifdef __GNUC__
|
||||
# pragma GCC diagnostic push
|
||||
@@ -621,16 +617,9 @@ gfxPlatform::Init()
|
||||
|
||||
nsresult rv;
|
||||
|
||||
bool usePlatformFontList = true;
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
usePlatformFontList = gfxPlatformGtk::UseFcFontList();
|
||||
#endif
|
||||
|
||||
if (usePlatformFontList) {
|
||||
rv = gfxPlatformFontList::Init();
|
||||
if (NS_FAILED(rv)) {
|
||||
NS_RUNTIMEABORT("Could not initialize gfxPlatformFontList");
|
||||
}
|
||||
rv = gfxPlatformFontList::Init();
|
||||
if (NS_FAILED(rv)) {
|
||||
NS_RUNTIMEABORT("Could not initialize gfxPlatformFontList");
|
||||
}
|
||||
|
||||
gPlatform->mScreenReferenceSurface =
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
#include "gfx2DGlue.h"
|
||||
#include "gfxFcPlatformFontList.h"
|
||||
#include "gfxFontconfigUtils.h"
|
||||
#include "gfxFontconfigFonts.h"
|
||||
#include "gfxConfig.h"
|
||||
#include "gfxContext.h"
|
||||
#include "gfxUserFontSet.h"
|
||||
#include "gfxUtils.h"
|
||||
#include "gfxFT2FontBase.h"
|
||||
#include "gfxPrefs.h"
|
||||
#include "gfxTextRun.h"
|
||||
#include "VsyncSource.h"
|
||||
#include "mozilla/Atomics.h"
|
||||
#include "mozilla/Monitor.h"
|
||||
@@ -67,23 +67,14 @@ using namespace mozilla;
|
||||
using namespace mozilla::gfx;
|
||||
using namespace mozilla::unicode;
|
||||
|
||||
gfxFontconfigUtils *gfxPlatformGtk::sFontconfigUtils = nullptr;
|
||||
|
||||
#if (MOZ_WIDGET_GTK == 2)
|
||||
static cairo_user_data_key_t cairo_gdk_drawable_key;
|
||||
#endif
|
||||
|
||||
bool gfxPlatformGtk::sUseFcFontList = false;
|
||||
|
||||
gfxPlatformGtk::gfxPlatformGtk()
|
||||
{
|
||||
gtk_init(nullptr, nullptr);
|
||||
|
||||
sUseFcFontList = mozilla::Preferences::GetBool("gfx.font_rendering.fontconfig.fontlist.enabled");
|
||||
if (!sUseFcFontList && !sFontconfigUtils) {
|
||||
sFontconfigUtils = gfxFontconfigUtils::GetFontconfigUtils();
|
||||
}
|
||||
|
||||
mMaxGenericSubstitutions = UNINITIALIZED_VALUE;
|
||||
|
||||
#ifdef MOZ_X11
|
||||
@@ -117,12 +108,6 @@ gfxPlatformGtk::gfxPlatformGtk()
|
||||
|
||||
gfxPlatformGtk::~gfxPlatformGtk()
|
||||
{
|
||||
if (!sUseFcFontList) {
|
||||
gfxFontconfigUtils::Shutdown();
|
||||
sFontconfigUtils = nullptr;
|
||||
gfxPangoFontGroup::Shutdown();
|
||||
}
|
||||
|
||||
#ifdef MOZ_X11
|
||||
if (mCompositorDisplay) {
|
||||
XCloseDisplay(mCompositorDisplay);
|
||||
@@ -197,27 +182,17 @@ gfxPlatformGtk::GetFontList(nsIAtom *aLangGroup,
|
||||
const nsACString& aGenericFamily,
|
||||
nsTArray<nsString>& aListOfFonts)
|
||||
{
|
||||
if (sUseFcFontList) {
|
||||
gfxPlatformFontList::PlatformFontList()->GetFontList(aLangGroup,
|
||||
aGenericFamily,
|
||||
aListOfFonts);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return sFontconfigUtils->GetFontList(aLangGroup,
|
||||
aGenericFamily,
|
||||
aListOfFonts);
|
||||
gfxPlatformFontList::PlatformFontList()->GetFontList(aLangGroup,
|
||||
aGenericFamily,
|
||||
aListOfFonts);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
gfxPlatformGtk::UpdateFontList()
|
||||
{
|
||||
if (sUseFcFontList) {
|
||||
gfxPlatformFontList::PlatformFontList()->UpdateFontList();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return sFontconfigUtils->UpdateFontList();
|
||||
gfxPlatformFontList::PlatformFontList()->UpdateFontList();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// xxx - this is ubuntu centric, need to go through other distros and flesh
|
||||
@@ -280,13 +255,9 @@ gfxPlatformGtk::CreatePlatformFontList()
|
||||
nsresult
|
||||
gfxPlatformGtk::GetStandardFamilyName(const nsAString& aFontName, nsAString& aFamilyName)
|
||||
{
|
||||
if (sUseFcFontList) {
|
||||
gfxPlatformFontList::PlatformFontList()->
|
||||
GetStandardFamilyName(aFontName, aFamilyName);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return sFontconfigUtils->GetStandardFamilyName(aFontName, aFamilyName);
|
||||
gfxPlatformFontList::PlatformFontList()->
|
||||
GetStandardFamilyName(aFontName, aFamilyName);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
gfxFontGroup *
|
||||
@@ -296,13 +267,8 @@ gfxPlatformGtk::CreateFontGroup(const FontFamilyList& aFontFamilyList,
|
||||
gfxUserFontSet* aUserFontSet,
|
||||
gfxFloat aDevToCssSize)
|
||||
{
|
||||
if (sUseFcFontList) {
|
||||
return new gfxFontGroup(aFontFamilyList, aStyle, aTextPerf,
|
||||
aUserFontSet, aDevToCssSize);
|
||||
}
|
||||
|
||||
return new gfxPangoFontGroup(aFontFamilyList, aStyle,
|
||||
aUserFontSet, aDevToCssSize);
|
||||
return new gfxFontGroup(aFontFamilyList, aStyle, aTextPerf,
|
||||
aUserFontSet, aDevToCssSize);
|
||||
}
|
||||
|
||||
gfxFontEntry*
|
||||
@@ -311,14 +277,9 @@ gfxPlatformGtk::LookupLocalFont(const nsAString& aFontName,
|
||||
int16_t aStretch,
|
||||
uint8_t aStyle)
|
||||
{
|
||||
if (sUseFcFontList) {
|
||||
gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
|
||||
return pfl->LookupLocalFont(aFontName, aWeight, aStretch,
|
||||
aStyle);
|
||||
}
|
||||
|
||||
return gfxPangoFontGroup::NewFontEntry(aFontName, aWeight,
|
||||
aStretch, aStyle);
|
||||
gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
|
||||
return pfl->LookupLocalFont(aFontName, aWeight, aStretch,
|
||||
aStyle);
|
||||
}
|
||||
|
||||
gfxFontEntry*
|
||||
@@ -329,16 +290,9 @@ gfxPlatformGtk::MakePlatformFont(const nsAString& aFontName,
|
||||
const uint8_t* aFontData,
|
||||
uint32_t aLength)
|
||||
{
|
||||
if (sUseFcFontList) {
|
||||
gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
|
||||
return pfl->MakePlatformFont(aFontName, aWeight, aStretch,
|
||||
aStyle, aFontData, aLength);
|
||||
}
|
||||
|
||||
// passing ownership of the font data to the new font entry
|
||||
return gfxPangoFontGroup::NewFontEntry(aFontName, aWeight,
|
||||
aStretch, aStyle,
|
||||
aFontData, aLength);
|
||||
gfxPlatformFontList* pfl = gfxPlatformFontList::PlatformFontList();
|
||||
return pfl->MakePlatformFont(aFontName, aWeight, aStretch,
|
||||
aStyle, aFontData, aLength);
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -429,11 +383,9 @@ void gfxPlatformGtk::FontsPrefsChanged(const char *aPref)
|
||||
}
|
||||
|
||||
mMaxGenericSubstitutions = UNINITIALIZED_VALUE;
|
||||
if (sUseFcFontList) {
|
||||
gfxFcPlatformFontList* pfl = gfxFcPlatformFontList::PlatformFontList();
|
||||
pfl->ClearGenericMappings();
|
||||
FlushFontAndWordCaches();
|
||||
}
|
||||
gfxFcPlatformFontList* pfl = gfxFcPlatformFontList::PlatformFontList();
|
||||
pfl->ClearGenericMappings();
|
||||
FlushFontAndWordCaches();
|
||||
}
|
||||
|
||||
uint32_t gfxPlatformGtk::MaxGenericSubstitions()
|
||||
|
||||
@@ -111,8 +111,6 @@ public:
|
||||
}
|
||||
#endif
|
||||
|
||||
static bool UseFcFontList() { return sUseFcFontList; }
|
||||
|
||||
bool UseImageOffscreenSurfaces();
|
||||
|
||||
virtual gfxImageFormat GetOffscreenFormat() override;
|
||||
@@ -154,10 +152,6 @@ private:
|
||||
#ifdef MOZ_X11
|
||||
Display* mCompositorDisplay;
|
||||
#endif
|
||||
|
||||
// xxx - this will be removed once the new fontconfig platform font list
|
||||
// replaces gfxPangoFontGroup
|
||||
static bool sUseFcFontList;
|
||||
};
|
||||
|
||||
#endif /* GFX_PLATFORM_GTK_H */
|
||||
|
||||
@@ -26,10 +26,6 @@
|
||||
#include "mozilla/gfx/Logging.h" // for gfxCriticalError
|
||||
#include "mozilla/UniquePtr.h"
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
|
||||
#endif
|
||||
|
||||
#ifdef XP_WIN
|
||||
#include "gfxWindowsPlatform.h"
|
||||
#endif
|
||||
@@ -1599,7 +1595,6 @@ gfxFontGroup::gfxFontGroup(const FontFamilyList& aFontFamilyList,
|
||||
, mPageLang(gfxPlatformFontList::GetFontPrefLangFor(aStyle->language))
|
||||
, mLastPrefFirstFont(false)
|
||||
, mSkipDrawing(false)
|
||||
, mSkipUpdateUserFonts(false)
|
||||
{
|
||||
// We don't use SetUserFontSet() here, as we want to unconditionally call
|
||||
// BuildFontList() rather than only do UpdateUserFonts() if it changed.
|
||||
@@ -1616,14 +1611,6 @@ gfxFontGroup::BuildFontList()
|
||||
{
|
||||
bool enumerateFonts = true;
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
// xxx - eliminate this once gfxPangoFontGroup is no longer needed
|
||||
enumerateFonts = gfxPlatformGtk::UseFcFontList();
|
||||
#endif
|
||||
if (!enumerateFonts) {
|
||||
return;
|
||||
}
|
||||
|
||||
// initialize fonts in the font family list
|
||||
AutoTArray<gfxFontFamily*,10> fonts;
|
||||
gfxPlatformFontList *pfl = gfxPlatformFontList::PlatformFontList();
|
||||
@@ -2338,7 +2325,7 @@ gfxFontGroup::InitScriptRun(DrawTarget* aDrawTarget,
|
||||
"don't call InitScriptRun with aborted shaping state");
|
||||
|
||||
// confirm the load state of userfonts in the list
|
||||
if (!mSkipUpdateUserFonts && mUserFontSet &&
|
||||
if (mUserFontSet &&
|
||||
mCurrGeneration != mUserFontSet->GetGeneration()) {
|
||||
UpdateUserFonts();
|
||||
}
|
||||
@@ -3076,8 +3063,6 @@ gfxFontGroup::GetRebuildGeneration()
|
||||
return mUserFontSet->GetRebuildGeneration();
|
||||
}
|
||||
|
||||
// note: gfxPangoFontGroup overrides UpdateUserFonts, such that
|
||||
// BuildFontList is never used
|
||||
void
|
||||
gfxFontGroup::UpdateUserFonts()
|
||||
{
|
||||
|
||||
@@ -1108,9 +1108,6 @@ protected:
|
||||
// download to complete (or fallback
|
||||
// timer to fire)
|
||||
|
||||
// xxx - gfxPangoFontGroup skips UpdateUserFonts
|
||||
bool mSkipUpdateUserFonts;
|
||||
|
||||
/**
|
||||
* Textrun creation short-cuts for special cases where we don't need to
|
||||
* call a font shaper to generate glyphs.
|
||||
|
||||
@@ -926,32 +926,6 @@ gfxUserFontSet::AddUserFontEntry(const nsAString& aFamilyName,
|
||||
}
|
||||
}
|
||||
|
||||
gfxUserFontEntry*
|
||||
gfxUserFontSet::FindUserFontEntryAndLoad(gfxFontFamily* aFamily,
|
||||
const gfxFontStyle& aFontStyle,
|
||||
bool& aNeedsBold,
|
||||
bool& aWaitForUserFont)
|
||||
{
|
||||
aWaitForUserFont = false;
|
||||
gfxFontEntry* fe = aFamily->FindFontForStyle(aFontStyle, aNeedsBold);
|
||||
NS_ASSERTION(!fe || fe->mIsUserFontContainer,
|
||||
"should only have userfont entries in userfont families");
|
||||
if (!fe) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
gfxUserFontEntry* userFontEntry = static_cast<gfxUserFontEntry*>(fe);
|
||||
|
||||
// start the load if it hasn't been loaded
|
||||
userFontEntry->Load();
|
||||
if (userFontEntry->GetPlatformFontEntry()) {
|
||||
return userFontEntry;
|
||||
}
|
||||
|
||||
aWaitForUserFont = userFontEntry->WaitForUserFont();
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void
|
||||
gfxUserFontSet::IncrementGeneration(bool aIsRebuild)
|
||||
{
|
||||
|
||||
@@ -248,14 +248,6 @@ public:
|
||||
// Look up names in a fontlist and return true if any are in the set
|
||||
bool ContainsUserFontSetFonts(const mozilla::FontFamilyList& aFontList) const;
|
||||
|
||||
// Lookup a font entry for a given style, returns null if not loaded.
|
||||
// aFamily must be a family returned by our LookupFamily method.
|
||||
// (only used by gfxPangoFontGroup for now)
|
||||
gfxUserFontEntry* FindUserFontEntryAndLoad(gfxFontFamily* aFamily,
|
||||
const gfxFontStyle& aFontStyle,
|
||||
bool& aNeedsBold,
|
||||
bool& aWaitForUserFont);
|
||||
|
||||
// check whether the given source is allowed to be loaded;
|
||||
// returns the Principal (for use in the key when caching the loaded font),
|
||||
// and whether the load should bypass the cache (force-reload).
|
||||
|
||||
@@ -76,7 +76,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
]
|
||||
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
||||
EXPORTS += [
|
||||
'gfxFontconfigFonts.h',
|
||||
'gfxFT2FontBase.h',
|
||||
'gfxGdkNativeRenderer.h',
|
||||
'gfxPlatformGtk.h',
|
||||
@@ -87,8 +86,6 @@ elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
||||
]
|
||||
SOURCES += [
|
||||
'gfxFcPlatformFontList.cpp',
|
||||
'gfxFontconfigFonts.cpp',
|
||||
'gfxFontconfigUtils.cpp',
|
||||
'gfxFT2FontBase.cpp',
|
||||
'gfxFT2Utils.cpp',
|
||||
'gfxGdkNativeRenderer.cpp',
|
||||
|
||||
@@ -77,10 +77,6 @@
|
||||
#include "mozilla/StyleSheet.h"
|
||||
#include "mozilla/StyleSheetInlines.h"
|
||||
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
#include "gfxPlatformGtk.h" // xxx - for UseFcFontList
|
||||
#endif
|
||||
|
||||
|
||||
// Needed for Start/Stop of Image Animation
|
||||
#include "imgIContainer.h"
|
||||
@@ -2068,19 +2064,12 @@ nsPresContext::UserFontSetUpdated(gfxUserFontEntry* aUpdatedFont)
|
||||
if (!mShell)
|
||||
return;
|
||||
|
||||
bool usePlatformFontList = true;
|
||||
#if defined(MOZ_WIDGET_GTK)
|
||||
usePlatformFontList = gfxPlatformGtk::UseFcFontList();
|
||||
#endif
|
||||
|
||||
// xxx - until the Linux platform font list is always used, use full
|
||||
// restyle to force updates with gfxPangoFontGroup usage
|
||||
// Note: this method is called without a font when rules in the userfont set
|
||||
// are updated, which may occur during reflow as a result of the lazy
|
||||
// initialization of the userfont set. It would be better to avoid a full
|
||||
// restyle but until this method is only called outside of reflow, schedule a
|
||||
// full restyle in these cases.
|
||||
if (!usePlatformFontList || !aUpdatedFont) {
|
||||
if (!aUpdatedFont) {
|
||||
PostRebuildAllStyleDataEvent(NS_STYLE_HINT_REFLOW, eRestyle_ForceDescendants);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -4114,13 +4114,7 @@ pref("intl.ime.use_simple_context_on_password_field", true);
|
||||
pref("intl.ime.use_simple_context_on_password_field", false);
|
||||
#endif
|
||||
|
||||
# enable new platform fontlist for linux on GTK platforms
|
||||
# temporary pref to allow flipping back to the existing
|
||||
# gfxPangoFontGroup/gfxFontconfigUtils code for handling system fonts
|
||||
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
pref("gfx.font_rendering.fontconfig.fontlist.enabled", true);
|
||||
|
||||
// maximum number of fonts to substitute for a generic
|
||||
pref("gfx.font_rendering.fontconfig.max_generic_substitutions", 3);
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user