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

Bug 1459158 - Don't apply variation values from CSS font-weight/font-stretch properties if the font's variation axes appear to use a non-CSS-like scale. r=jwatt

Browse Source
This commit is contained in:
Jonathan Kew 2018-05-04 17:36:01 +01:00
parent 034384a62d
commit 5182b6ad11
2 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
gfx/thebes/gfxFontEntry.cpp
View File

@ -1025,7 +1025,9 @@ gfxFontEntry::SetupVariationRanges()
switch (axis.mTag) {
case HB_TAG('w','g','h','t'):
// If the axis range looks like it doesn't fit the CSS font-weight
// scale, we don't hook up the high-level property. Setting 'wght'
// scale, we don't hook up the high-level property, and we mark
// the face (in mRangeFlags) as having non-standard weight. This
// means we won't map CSS font-weight to the axis. Setting 'wght'
// with font-variation-settings will still work.
// Strictly speaking, the min value should be checked against 1.0,
// not 0.0, but we'll allow font makers that amount of leeway, as
@ -1041,6 +1043,8 @@ gfxFontEntry::SetupVariationRanges()
mWeightRange =
WeightRange(FontWeight(std::max(1.0f, axis.mMinValue)),
FontWeight(axis.mMaxValue));
} else {
mRangeFlags |= RangeFlags::eNonCSSWeight;
}
break;
@ -1053,6 +1057,8 @@ gfxFontEntry::SetupVariationRanges()
mStretchRange =
StretchRange(FontStretch(axis.mMinValue),
FontStretch(axis.mMaxValue));
} else {
mRangeFlags |= RangeFlags::eNonCSSStretch;
}
break;
@ -1117,17 +1123,29 @@ gfxFontEntry::GetVariationsForStyle(nsTArray<gfxFontVariation>& aResult,
// The value used is clamped to the range available in the font face,
// unless the face is a user font where no explicit descriptor was
// given, indicated by the corresponding 'auto' range-flag.
float weight = (IsUserFont() && (mRangeFlags & RangeFlags::eAutoWeight))
? aStyle.weight.ToFloat()
: Weight().Clamp(aStyle.weight).ToFloat();
aResult.AppendElement(gfxFontVariation{HB_TAG('w','g','h','t'),
weight});
float stretch = (IsUserFont() && (mRangeFlags & RangeFlags::eAutoStretch))
? aStyle.stretch.Percentage()
: Stretch().Clamp(aStyle.stretch).Percentage();
aResult.AppendElement(gfxFontVariation{HB_TAG('w','d','t','h'),
stretch});
// We don't do these mappings if the font entry has weight and/or stretch
// ranges that do not appear to use the CSS property scale. Some older
// fonts created for QuickDrawGX/AAT may use "normalized" values where the
// standard variation is 1.0 rather than 400.0 (weight) or 100.0 (stretch).
if (!(mRangeFlags & RangeFlags::eNonCSSWeight)) {
float weight =
(IsUserFont() && (mRangeFlags & RangeFlags::eAutoWeight))
? aStyle.weight.ToFloat()
: Weight().Clamp(aStyle.weight).ToFloat();
aResult.AppendElement(gfxFontVariation{HB_TAG('w','g','h','t'),
weight});
}
if (!(mRangeFlags & RangeFlags::eNonCSSStretch)) {
float stretch =
(IsUserFont() && (mRangeFlags & RangeFlags::eAutoStretch))
? aStyle.stretch.Percentage()
: Stretch().Clamp(aStyle.stretch).Percentage();
aResult.AppendElement(gfxFontVariation{HB_TAG('w','d','t','h'),
stretch});
}
if (SlantStyle().Min().IsOblique()) {
// Figure out what slant angle we should try to match from the

8
gfx/thebes/gfxFontEntry.h
View File

@ -439,7 +439,13 @@ public:
// Flag to record whether the face has a variable "wght" axis
// that supports "bold" values, used to disable the application
// of synthetic-bold effects.
eBoldVariableWeight = (1 << 3)
eBoldVariableWeight = (1 << 3),
// Flags to record if the face uses a non-CSS-compatible scale
// for weight and/or stretch, in which case we won't map the
// properties to the variation axes (though they can still be
// explicitly set using font-variation-settings).
eNonCSSWeight = (1 << 4),
eNonCSSStretch = (1 << 5)
};
RangeFlags mRangeFlags = RangeFlags::eNoFlags;