mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
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:
parent
6630278821
commit
d4b40be62c
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user