wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 736276 - Ensure we can never double addref a cairo scaled font in ScaledFontBase r=mattwoodrow

Browse Source
This commit is contained in:
George Wright 2013-06-28 22:50:59 -04:00
parent 050d2d58af
commit d2b4508586
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/2d/ScaledFontBase.cpp
View File

@ -112,6 +112,12 @@ ScaledFontBase::SetCairoScaledFont(cairo_scaled_font_t* font)
{
MOZ_ASSERT(!mScaledFont);
if (font == mScaledFont)
return;
if (mScaledFont)
cairo_scaled_font_destroy(mScaledFont);
mScaledFont = font;
cairo_scaled_font_reference(mScaledFont);
}

2
gfx/2d/ScaledFontCairo.cpp
View File

@ -35,7 +35,7 @@ namespace gfx {
ScaledFontCairo::ScaledFontCairo(cairo_scaled_font_t* aScaledFont, Float aSize)
: ScaledFontBase(aSize)
{
mScaledFont = aScaledFont;
SetCairoScaledFont(aScaledFont);
}
#if defined(USE_SKIA) && defined(MOZ_ENABLE_FREETYPE)