Bug 1099977. Part 1.5: Make gfxFT2FontBase::GetSpaceGlyph work for zero-sized fonts. r=jfkthame

--HG--
extra : rebase_source : 41fe8ce9c751d4ffcfa3adb001640c60d1f4c449
This commit is contained in:
Robert O'Callahan 2014-11-19 22:41:42 +13:00
parent ced22b1553
commit 198bbca1c1

View File

@ -116,7 +116,7 @@ gfxFT2FontBase::GetHorizontalMetrics()
if (MOZ_UNLIKELY(GetStyle()->size <= 0.0)) {
new(&mMetrics) gfxFont::Metrics(); // zero initialize
mSpaceGlyph = 0;
mSpaceGlyph = GetGlyph(' ');
} else {
gfxFT2LockedFace face(this);
face.GetMetrics(&mMetrics, &mSpaceGlyph);
@ -144,8 +144,6 @@ gfxFT2FontBase::GetHorizontalMetrics()
uint32_t
gfxFT2FontBase::GetSpaceGlyph()
{
NS_ASSERTION(GetStyle()->size != 0,
"forgot to short-circuit a text run with zero-sized font?");
GetHorizontalMetrics();
return mSpaceGlyph;
}