wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 906646 - glyphs with an SVG representation should never be considered "contained". r=roc

Browse Source
This commit is contained in:
Jonathan Kew 2013-09-04 12:16:36 +01:00
parent df62d8f5c7
commit 438bf47623
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/thebes/gfxFont.cpp
View File

@ -3386,6 +3386,19 @@ gfxFont::SetupGlyphExtents(gfxContext *aContext, uint32_t aGlyphID, bool aNeedTi
{
gfxContextMatrixAutoSaveRestore matrixRestore(aContext);
aContext->IdentityMatrix();
gfxRect svgBounds;
if (mFontEntry->TryGetSVGData() && mFontEntry->HasSVGGlyph(aGlyphID) &&
mFontEntry->GetSVGGlyphExtents(aContext, aGlyphID, &svgBounds)) {
gfxFloat d2a = aExtents->GetAppUnitsPerDevUnit();
aExtents->SetTightGlyphExtents(aGlyphID,
gfxRect(svgBounds.x * d2a,
svgBounds.y * d2a,
svgBounds.width * d2a,
svgBounds.height * d2a));
return;
}
cairo_glyph_t glyph;
glyph.index = aGlyphID;
glyph.x = 0;
@ -3414,16 +3427,6 @@ gfxFont::SetupGlyphExtents(gfxContext *aContext, uint32_t aGlyphID, bool aNeedTi
gfxFloat d2a = appUnitsPerDevUnit;
gfxRect bounds(extents.x_bearing*d2a, extents.y_bearing*d2a,
extents.width*d2a, extents.height*d2a);
gfxRect svgBounds;
if (mFontEntry->TryGetSVGData() &&
mFontEntry->HasSVGGlyph(aGlyphID) &&
mFontEntry->GetSVGGlyphExtents(aContext, aGlyphID, &svgBounds)) {
bounds = bounds.Union(gfxRect(svgBounds.x * d2a, svgBounds.y * d2a,
svgBounds.width * d2a, svgBounds.height * d2a));
}
aExtents->SetTightGlyphExtents(aGlyphID, bounds);
}