wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-28 03:17:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2191 - Remove virtual from gfxFont::GetCairoScaledFont.

Browse source 
Backported from Mozilla bug 1385029.
This commit is contained in:
Job Bautista 2023-04-05 19:36:10 +08:00 • committed by roytam1
commit 44b74873c1
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gfx/thebes/gfxDWriteFonts.cpp
View file

@ -458,7 +458,7 @@ gfxDWriteFont::GetSpaceGlyph()
bool bool
gfxDWriteFont::SetupCairoFont(DrawTarget* aDrawTarget) gfxDWriteFont::SetupCairoFont(DrawTarget* aDrawTarget)
{ {
cairo_scaled_font_t *scaledFont = GetCairoScaledFont(); cairo_scaled_font_t *scaledFont = InitCairoScaledFont();
if (cairo_scaled_font_status(scaledFont) != CAIRO_STATUS_SUCCESS) { if (cairo_scaled_font_status(scaledFont) != CAIRO_STATUS_SUCCESS) {
// Don't cairo_set_scaled_font as that would propagate the error to // Don't cairo_set_scaled_font as that would propagate the error to
// the cairo_t, precluding any further drawing. // the cairo_t, precluding any further drawing.
@ -495,7 +495,7 @@ gfxDWriteFont::CairoFontFace()
cairo_scaled_font_t * cairo_scaled_font_t *
gfxDWriteFont::GetCairoScaledFont() gfxDWriteFont::InitCairoScaledFont()
{ {
if (!mScaledFont) { if (!mScaledFont) {
cairo_matrix_t sizeMatrix; cairo_matrix_t sizeMatrix;
@ -693,7 +693,7 @@ gfxDWriteFont::GetScaledFont(mozilla::gfx::DrawTarget *aTarget)
if (aTarget->GetBackendType() == BackendType::CAIRO) { if (aTarget->GetBackendType() == BackendType::CAIRO) {
if (!mAzureScaledFont->GetCairoScaledFont()) { if (!mAzureScaledFont->GetCairoScaledFont()) {
cairo_scaled_font_t* cairoScaledFont = GetCairoScaledFont(); cairo_scaled_font_t* cairoScaledFont = InitCairoScaledFont();
if (!cairoScaledFont) { if (!cairoScaledFont) {
return nullptr; return nullptr;
} }

4
gfx/thebes/gfxDWriteFonts.h
View file

@ -69,9 +69,9 @@ public:
virtual already_AddRefed<mozilla::gfx::ScaledFont> virtual already_AddRefed<mozilla::gfx::ScaledFont>
GetScaledFont(mozilla::gfx::DrawTarget *aTarget) override; GetScaledFont(mozilla::gfx::DrawTarget *aTarget) override;
virtual cairo_scaled_font_t *GetCairoScaledFont() override;
protected: protected:
cairo_scaled_font_t *InitCairoScaledFont();
virtual const Metrics& GetHorizontalMetrics() override; virtual const Metrics& GetHorizontalMetrics() override;
bool GetFakeMetricsForArialBlack(DWRITE_FONT_METRICS *aFontMetrics); bool GetFakeMetricsForArialBlack(DWRITE_FONT_METRICS *aFontMetrics);

2
gfx/thebes/gfxFont.h
View file

@ -1452,7 +1452,7 @@ public:
const nsString& GetName() const { return mFontEntry->Name(); } const nsString& GetName() const { return mFontEntry->Name(); }
const gfxFontStyle *GetStyle() const { return &mStyle; } const gfxFontStyle *GetStyle() const { return &mStyle; }
virtual cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; } cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; }
virtual gfxFont* CopyWithAntialiasOption(AntialiasOption anAAOption) { virtual gfxFont* CopyWithAntialiasOption(AntialiasOption anAAOption) {
// platforms where this actually matters should override // platforms where this actually matters should override