diff options
| author | Job Bautista <jobbautista9@aol.com> | 2023-04-05 18:31:13 +0800 |
|---|---|---|
| committer | Job Bautista <jobbautista9@protonmail.com> | 2023-04-05 21:22:17 +0800 |
| commit | b494419e915d461e2990facfdbf7c91b98da2543 (patch) | |
| tree | b92fcbaafa3ef11f506526b51f36d99cbde08d20 /gfx | |
| parent | 57ef40f7833c28fc4d6ad6b2903ca9f2f112b7a2 (diff) | |
| download | uxp-b494419e915d461e2990facfdbf7c91b98da2543.tar.gz | |
Issue #2191 - Make ScaledFont::SetCairoScaledFont virtual so it can be accessed from outside Moz2D.
Backported from Mozilla bug 1385029.
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/2d/2D.h | 3 | ||||
| -rw-r--r-- | gfx/2d/ScaledFontBase.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gfx/2d/2D.h b/gfx/2d/2D.h index e2020dc9e6..7c37a7f6b8 100644 --- a/gfx/2d/2D.h +++ b/gfx/2d/2D.h @@ -718,6 +718,9 @@ public: return mUserData.Get(key); } + virtual cairo_scaled_font_t* GetCairoScaledFont() { return nullptr; } + virtual void SetCairoScaledFont(cairo_scaled_font_t* font) {} + protected: ScaledFont() {} diff --git a/gfx/2d/ScaledFontBase.h b/gfx/2d/ScaledFontBase.h index e4bb4f2f8c..93541c4114 100644 --- a/gfx/2d/ScaledFontBase.h +++ b/gfx/2d/ScaledFontBase.h @@ -48,8 +48,8 @@ public: #ifdef USE_CAIRO_SCALED_FONT bool PopulateCairoScaledFont(); - cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; } - void SetCairoScaledFont(cairo_scaled_font_t* font); + virtual cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; } + virtual void SetCairoScaledFont(cairo_scaled_font_t* font); #endif protected: |