bug 744480 - check for failure to set up the cairo font. r=bas

This commit is contained in:
Jonathan Kew 2012-04-13 17:39:39 +01:00
parent d473f3d2f0
commit 539dfb729f

View File

@ -156,9 +156,13 @@ gfxGDIFont::ShapeWord(gfxContext *aContext,
bool ok = false;
// ensure the cairo font is set up, so there's no risk it'll fall back to
// creating a "toy" font internally (see bug 544617)
SetupCairoFont(aContext);
// Ensure the cairo font is set up, so there's no risk it'll fall back to
// creating a "toy" font internally (see bug 544617).
// We must check that this succeeded, otherwise we risk cairo creating the
// wrong kind of font internally as a fallback (bug 744480).
if (!SetupCairoFont(aContext)) {
return false;
}
#ifdef MOZ_GRAPHITE
if (mGraphiteShaper && gfxPlatform::GetPlatform()->UseGraphiteShaping()) {