Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 13:55:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 994ecd62b880

Browse Source
This commit is contained in:
Robert O'Callahan 2009-04-12 01:02:06 +12:00
parent 51157544df
commit 5dd7bd88b9
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gfx/thebes/src/gfxWindowsFonts.cpp
View File

@ -1138,24 +1138,8 @@ gfxWindowsFont::Measure(gfxTextRun *aTextRun,
}
}
gfxFont::RunMetrics metrics = gfxFont::Measure(aTextRun, aStart, aEnd,
aBoundingBoxType, aRefContext,
aSpacing);
// if aBoundingBoxType is LOOSE_INK_EXTENTS
// and the underlying cairo font may be antialiased,
// we can't trust Windows to have considered all the pixels
// so we need to add "padding" to the bounds.
// (see bugs 475968, 439831, compare also bug 445087)
if (aBoundingBoxType == LOOSE_INK_EXTENTS &&
mAntialiasOption != CAIRO_ANTIALIAS_NONE &&
metrics.mBoundingBox.size.width > 0) {
const PRUint32 appUnitsPerDevUnit = aTextRun->GetAppUnitsPerDevUnit();
metrics.mBoundingBox.pos.x -= appUnitsPerDevUnit;
metrics.mBoundingBox.size.width += 3 * appUnitsPerDevUnit;
}
return metrics;
return gfxFont::Measure(aTextRun, aStart, aEnd,
aBoundingBoxType, aRefContext, aSpacing);
}
FontEntry*