Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1873708 - patch 1 - Synthesize fallback glyph extents for color glyphs if FreeType returned empty bounds, to avoid clipped rendering. r=gfx-reviewers,aosmond

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D198278
This commit is contained in:
Jonathan Kew 2024-01-15 09:14:09 +00:00
parent cdc22801e4
commit 8565c0e926
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/thebes/gfxFT2FontBase.cpp
View File

@ -633,7 +633,7 @@ FT_Vector gfxFT2FontBase::GetEmboldenStrength(FT_Face aFace) const {
}
bool gfxFT2FontBase::GetFTGlyphExtents(uint16_t aGID, int32_t* aAdvance,
IntRect* aBounds) const {
IntRect* aBounds) {
gfxFT2LockedFace face(this);
MOZ_ASSERT(face.get());
if (!face.get()) {
@ -720,7 +720,26 @@ bool gfxFT2FontBase::GetFTGlyphExtents(uint16_t aGID, int32_t* aAdvance,
}
}
*aBounds = IntRect(x, y, x2 - x, y2 - y);
// Color fonts may not have reported the right bounds here, if there wasn't
// an outline for the nominal glyph ID.
// In principle we could use COLRFonts::GetColorGlyphBounds to retrieve the
// true bounds of the rendering, but that's more expensive; probably better
// to just use the font-wide ascent/descent as a heuristic that will
// generally ensure everything gets rendered.
if (aBounds->IsEmpty() &&
GetFontEntry()->HasFontTable(TRUETYPE_TAG('C', 'O', 'L', 'R'))) {
const auto& fm = GetMetrics(nsFontMetrics::eHorizontal);
// aBounds is stored as FT_F26Dot6, so scale values from `fm` by 64.
aBounds->y = int32_t(-NS_round(fm.maxAscent * 64.0));
aBounds->height =
int32_t(NS_round((fm.maxAscent + fm.maxDescent) * 64.0));
aBounds->x = 0;
aBounds->width =
int32_t(aAdvance ? *aAdvance : NS_round(fm.maxAdvance * 64.0));
}
}
return true;
}
@ -729,7 +748,7 @@ bool gfxFT2FontBase::GetFTGlyphExtents(uint16_t aGID, int32_t* aAdvance,
* FreeType for the glyph extents and initialize the glyph metrics.
*/
const gfxFT2FontBase::GlyphMetrics& gfxFT2FontBase::GetCachedGlyphMetrics(
uint16_t aGID, IntRect* aBounds) const {
uint16_t aGID, IntRect* aBounds) {
{
// Try to read cached metrics without exclusive locking.
AutoReadLock lock(mLock);

8
gfx/thebes/gfxFT2FontBase.h
View File

@ -80,7 +80,7 @@ class gfxFT2FontBase : public gfxFont {
// Get advance (and optionally bounds) of a single glyph from FreeType,
// and return true, or return false if we failed.
bool GetFTGlyphExtents(uint16_t aGID, int32_t* aWidth,
mozilla::gfx::IntRect* aBounds = nullptr) const;
mozilla::gfx::IntRect* aBounds = nullptr);
protected:
~gfxFT2FontBase() override;
@ -143,10 +143,10 @@ class gfxFT2FontBase : public gfxFont {
};
const GlyphMetrics& GetCachedGlyphMetrics(
uint16_t aGID, mozilla::gfx::IntRect* aBounds = nullptr) const;
uint16_t aGID, mozilla::gfx::IntRect* aBounds = nullptr);
mutable mozilla::UniquePtr<nsTHashMap<nsUint32HashKey, GlyphMetrics>>
mGlyphMetrics MOZ_GUARDED_BY(mLock);
mozilla::UniquePtr<nsTHashMap<nsUint32HashKey, GlyphMetrics>> mGlyphMetrics
MOZ_GUARDED_BY(mLock);
};
#endif /* GFX_FT2FONTBASE_H */