Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1385029 - remove virtual from gfxFont::GetCairoScaledFont. r=jfkthame

Browse Source 
MozReview-Commit-ID: FNXL9aKtlKa
This commit is contained in:
Lee Salzman 2017-08-07 16:20:48 -04:00
parent a21ad6d19e
commit 24cb8efdec
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/thebes/gfxDWriteFonts.cpp
View File

@ -460,7 +460,7 @@ gfxDWriteFont::GetSpaceGlyph()
bool
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) {
// Don't cairo_set_scaled_font as that would propagate the error to
// the cairo_t, precluding any further drawing.
@ -497,7 +497,7 @@ gfxDWriteFont::CairoFontFace()
cairo_scaled_font_t *
gfxDWriteFont::GetCairoScaledFont()
gfxDWriteFont::InitCairoScaledFont()
{
if (!mScaledFont) {
cairo_matrix_t sizeMatrix;
@ -711,7 +711,7 @@ gfxDWriteFont::GetScaledFont(mozilla::gfx::DrawTarget *aTarget)
if (aTarget->GetBackendType() == BackendType::CAIRO) {
if (!mAzureScaledFont->GetCairoScaledFont()) {
cairo_scaled_font_t* cairoScaledFont = GetCairoScaledFont();
cairo_scaled_font_t* cairoScaledFont = InitCairoScaledFont();
if (!cairoScaledFont) {
return nullptr;
}

4
gfx/thebes/gfxDWriteFonts.h
View File

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

2
gfx/thebes/gfxFont.h
View File

@ -1446,7 +1446,7 @@ public:
const nsString& GetName() const { return mFontEntry->Name(); }
const gfxFontStyle *GetStyle() const { return &mStyle; }
virtual cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; }
cairo_scaled_font_t* GetCairoScaledFont() { return mScaledFont; }
virtual mozilla::UniquePtr<gfxFont>
CopyWithAntialiasOption(AntialiasOption anAAOption) {