Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 07:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1470075 - Use the proper vertical-advance of the <zero> glyph when setting up vertical-mode font metrics. r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D167035
This commit is contained in:
Jonathan Kew 2023-01-18 10:00:11 +00:00
parent d2868f8c9e
commit d52edfa6ad
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/thebes/gfxFont.cpp
View File

@ -4157,6 +4157,7 @@ void gfxFont::CreateVerticalMetrics() {
// Read real vertical metrics if available.
metrics->ideographicWidth = -1.0;
metrics->zeroWidth = -1.0;
gfxFontEntry::AutoTable vheaTable(mFontEntry, kVheaTableTag);
if (vheaTable && mFUnitsConvFactor >= 0.0) {
const MetricsHeader* vhea = reinterpret_cast<const MetricsHeader*>(
@ -4183,10 +4184,19 @@ void gfxFont::CreateVerticalMetrics() {
uint32_t gid = ProvidesGetGlyph()
? GetGlyph(kWaterIdeograph, 0)
: shaper->GetNominalGlyph(kWaterIdeograph);
int32_t advance = shaper->GetGlyphVAdvance(gid);
// Convert 16.16 fixed-point advance from the shaper to a float.
metrics->ideographicWidth =
advance < 0 ? metrics->aveCharWidth : advance / 65536.0;
if (gid) {
int32_t advance = shaper->GetGlyphVAdvance(gid);
// Convert 16.16 fixed-point advance from the shaper to a float.
metrics->ideographicWidth =
advance < 0 ? metrics->aveCharWidth : advance / 65536.0;
}
gid = ProvidesGetGlyph() ? GetGlyph('0', 0)
: shaper->GetNominalGlyph('0');
if (gid) {
int32_t advance = shaper->GetGlyphVAdvance(gid);
metrics->zeroWidth =
advance < 0 ? metrics->aveCharWidth : advance / 65536.0;
}
}
}
}
@ -4244,11 +4254,14 @@ void gfxFont::CreateVerticalMetrics() {
// Somewhat arbitrary values for now, subject to future refinement...
metrics->spaceWidth = metrics->aveCharWidth;
metrics->zeroWidth = metrics->aveCharWidth;
metrics->maxHeight = metrics->maxAscent + metrics->maxDescent;
metrics->xHeight = metrics->emHeight / 2;
metrics->capHeight = metrics->maxAscent;
if (metrics->zeroWidth < 0.0) {
metrics->zeroWidth = metrics->aveCharWidth;
}
if (!mVerticalMetrics.compareExchange(nullptr, metrics)) {
delete metrics;
}

3
testing/web-platform/meta/css/css-values/ch-unit-017.html.ini
View File

@ -1,3 +0,0 @@
[ch-unit-017.html]
expected: FAIL
bug: 1470075