wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-27 10:57:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2191 - Get rid of gfxFontconfigUtils.h since gfxFontconfigFontBase is unnecessary.

Browse source 
Backported from Mozilla bug 1385029.
This commit is contained in:
Job Bautista 2023-04-05 18:40:25 +08:00 • committed by roytam1
commit a35ce5e5e1
5 changed files with 28 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gfx/thebes/gfxFcPlatformFontList.h
View file

@ -11,6 +11,7 @@
#include "gfxFT2FontBase.h"
#include "gfxPlatformFontList.h"
#include "mozilla/mozalloc.h"
#include "nsAutoRef.h"
#include "nsClassHashtable.h"
#include <fontconfig/fontconfig.h>
@ -20,13 +21,12 @@
#include <cairo.h>
#include <cairo-ft.h>
#include "gfxFontconfigUtils.h" // xxx - only for nsAutoRefTraits<FcPattern>, etc.
template <>
class nsAutoRefTraits<FcObjectSet> : public nsPointerRefTraits<FcObjectSet>
class nsAutoRefTraits<FcPattern> : public nsPointerRefTraits<FcPattern>
{
public:
static void Release(FcObjectSet *ptr) { FcObjectSetDestroy(ptr); }
static void Release(FcPattern *ptr) { FcPatternDestroy(ptr); }
static void AddRef(FcPattern *ptr) { FcPatternReference(ptr); }
};
template <>
@ -205,7 +205,7 @@ protected:
bool mForceScalable;
};
class gfxFontconfigFont : public gfxFontconfigFontBase {
class gfxFontconfigFont : public gfxFT2FontBase {
public:
gfxFontconfigFont(cairo_scaled_font_t *aScaledFont,
FcPattern *aPattern,
@ -214,8 +214,13 @@ public:
const gfxFontStyle *aFontStyle,
bool aNeedsBold);
protected:
virtual FontType GetType() const override { return FONT_TYPE_FONTCONFIG; }
virtual FcPattern *GetPattern() const { return mPattern; }
private:
virtual ~gfxFontconfigFont();
nsCountedRef<FcPattern> mPattern;
};
class nsILanguageAtomService;