mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-22 08:27:31 +09:00
Issue #2191 - Get rid of gfxFontconfigUtils.h since gfxFontconfigFontBase is unnecessary.
Backported from Mozilla bug 1385029.
This commit is contained in:
parent
c54e2502b0
commit
a35ce5e5e1
5 changed files with 28 additions and 68 deletions
|
|
@ -55,6 +55,20 @@ using namespace mozilla::unicode;
|
|||
gfxPlatform::GetLog(eGfxLog_cmapdata), \
|
||||
LogLevel::Debug)
|
||||
|
||||
template <>
|
||||
class nsAutoRefTraits<FcFontSet> : public nsPointerRefTraits<FcFontSet>
|
||||
{
|
||||
public:
|
||||
static void Release(FcFontSet *ptr) { FcFontSetDestroy(ptr); }
|
||||
};
|
||||
|
||||
template <>
|
||||
class nsAutoRefTraits<FcObjectSet> : public nsPointerRefTraits<FcObjectSet>
|
||||
{
|
||||
public:
|
||||
static void Release(FcObjectSet *ptr) { FcObjectSetDestroy(ptr); }
|
||||
};
|
||||
|
||||
static const FcChar8*
|
||||
ToFcChar8Ptr(const char* aStr)
|
||||
{
|
||||
|
|
@ -1078,8 +1092,9 @@ gfxFontconfigFont::gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
|
|||
gfxFloat aAdjustedSize,
|
||||
gfxFontEntry *aFontEntry,
|
||||
const gfxFontStyle *aFontStyle,
|
||||
bool aNeedsBold) :
|
||||
gfxFontconfigFontBase(aScaledFont, aPattern, aFontEntry, aFontStyle)
|
||||
bool aNeedsBold)
|
||||
: gfxFT2FontBase(aScaledFont, aFontEntry, aFontStyle)
|
||||
, mPattern(aPattern)
|
||||
{
|
||||
mAdjustedSize = aAdjustedSize;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue