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 511339 - part 1 - implement -moz-font-feature-settings and -moz-font-language-override in CSS. r=dbaron

Browse Source
This commit is contained in:
Jonathan Kew 2010-07-13 21:30:42 +01:00
parent 8e9b38fd58
commit 1341e3f276
22 changed files with 232 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/canvas/src/nsCanvasRenderingContext2D.cpp
View File

@ -2355,7 +2355,9 @@ nsCanvasRenderingContext2D::SetFont(const nsAString& font)
fontStyle->mFont.sizeAdjust,
fontStyle->mFont.systemFont,
fontStyle->mFont.familyNameQuirks,
printerFont);
printerFont,
fontStyle->mFont.featureSettings,
fontStyle->mFont.languageOverride);
CurrentState().fontGroup =
gfxPlatform::GetPlatform()->CreateFontGroup(fontStyle->mFont.name,

8
dom/interfaces/css/nsIDOMNSCSS2Properties.idl
View File

@ -40,7 +40,7 @@
#include "nsIDOMSVGCSS2Properties.idl"
[scriptable, uuid(29B6104D-933F-4DD0-8FC8-BDEC0514469D)]
[scriptable, uuid(C8FA5710-8E47-4E76-9EBD-87E2ACF4F46C)]
interface nsIDOMNSCSS2Properties : nsIDOMSVGCSS2Properties
{
/* Non-DOM 2 extensions */
@ -121,6 +121,12 @@ interface nsIDOMNSCSS2Properties : nsIDOMSVGCSS2Properties
attribute DOMString MozFloatEdge;
// raises(DOMException) on setting
attribute DOMString MozFontFeatureSettings;
// raises(DOMException) on setting
attribute DOMString MozFontLanguageOverride;
// raises(DOMException) on setting
attribute DOMString MozForceBrokenImageIcon;
// raises(DOMException) on setting

28
gfx/src/nsFont.cpp
View File

@ -42,7 +42,9 @@
nsFont::nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant,
PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,
nscoord aSize, float aSizeAdjust)
nscoord aSize, float aSizeAdjust,
const nsString* aFeatureSettings,
const nsString* aLanguageOverride)
{
NS_ASSERTION(aName && IsASCII(nsDependentCString(aName)),
"Must only pass ASCII names here");
@ -56,11 +58,19 @@ nsFont::nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant,
decorations = aDecoration;
size = aSize;
sizeAdjust = aSizeAdjust;
if (aFeatureSettings) {
featureSettings = *aFeatureSettings;
}
if (aLanguageOverride) {
languageOverride = *aLanguageOverride;
}
}
nsFont::nsFont(const nsString& aName, PRUint8 aStyle, PRUint8 aVariant,
PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,
nscoord aSize, float aSizeAdjust)
nscoord aSize, float aSizeAdjust,
const nsString* aFeatureSettings,
const nsString* aLanguageOverride)
: name(aName)
{
style = aStyle;
@ -72,6 +82,12 @@ nsFont::nsFont(const nsString& aName, PRUint8 aStyle, PRUint8 aVariant,
decorations = aDecoration;
size = aSize;
sizeAdjust = aSizeAdjust;
if (aFeatureSettings) {
featureSettings = *aFeatureSettings;
}
if (aLanguageOverride) {
languageOverride = *aLanguageOverride;
}
}
nsFont::nsFont(const nsFont& aOther)
@ -86,6 +102,8 @@ nsFont::nsFont(const nsFont& aOther)
decorations = aOther.decorations;
size = aOther.size;
sizeAdjust = aOther.sizeAdjust;
featureSettings = aOther.featureSettings;
languageOverride = aOther.languageOverride;
}
nsFont::nsFont()
@ -105,7 +123,9 @@ PRBool nsFont::BaseEquals(const nsFont& aOther) const
(stretch == aOther.stretch) &&
(size == aOther.size) &&
(sizeAdjust == aOther.sizeAdjust) &&
name.Equals(aOther.name, nsCaseInsensitiveStringComparator())) {
name.Equals(aOther.name, nsCaseInsensitiveStringComparator()) &&
(featureSettings == aOther.featureSettings) &&
(languageOverride == aOther.languageOverride)) {
return PR_TRUE;
}
return PR_FALSE;
@ -133,6 +153,8 @@ nsFont& nsFont::operator=(const nsFont& aOther)
decorations = aOther.decorations;
size = aOther.size;
sizeAdjust = aOther.sizeAdjust;
featureSettings = aOther.featureSettings;
languageOverride = aOther.languageOverride;
return *this;
}

16
gfx/src/nsFont.h
View File

@ -102,15 +102,27 @@ struct NS_GFX nsFont {
// needs to be done.
float sizeAdjust;
// Font features from CSS font-feature-settings
nsString featureSettings;
// Language system tag, to override document language;
// this is an OpenType "language system" tag represented as a 32-bit integer
// (see http://www.microsoft.com/typography/otspec/languagetags.htm).
nsString languageOverride;
// Initialize the font struct with an ASCII name
nsFont(const char* aName, PRUint8 aStyle, PRUint8 aVariant,
PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,
nscoord aSize, float aSizeAdjust=0.0f);
nscoord aSize, float aSizeAdjust=0.0f,
const nsString* aFeatureSettings = nsnull,
const nsString* aLanguageOverride = nsnull);
// Initialize the font struct with a (potentially) unicode name
nsFont(const nsString& aName, PRUint8 aStyle, PRUint8 aVariant,
PRUint16 aWeight, PRInt16 aStretch, PRUint8 aDecoration,
nscoord aSize, float aSizeAdjust=0.0f);
nscoord aSize, float aSizeAdjust=0.0f,
const nsString* aFeatureSettings = nsnull,
const nsString* aLanguageOverride = nsnull);
// Make a copy of the given font
nsFont(const nsFont& aFont);

4
gfx/src/thebes/nsThebesFontMetrics.cpp
View File

@ -83,7 +83,9 @@ nsThebesFontMetrics::Init(const nsFont& aFont, nsIAtom* aLanguage,
size, aLanguage,
aFont.sizeAdjust, aFont.systemFont,
aFont.familyNameQuirks,
printerFont);
printerFont,
aFont.featureSettings,
aFont.languageOverride);
mFontGroup =
gfxPlatform::GetPlatform()->CreateFontGroup(aFont.name, mFontStyle,

28
layout/base/nsPresContext.cpp
View File

@ -1699,6 +1699,7 @@ InsertFontFaceRule(nsCSSFontFaceRule *aRule, gfxUserFontSet* aFontSet,
PRUint32 weight = NS_STYLE_FONT_WEIGHT_NORMAL;
PRUint32 stretch = NS_STYLE_FONT_STRETCH_NORMAL;
PRUint32 italicStyle = FONT_STYLE_NORMAL;
nsString featureSettings, languageOverride;
// set up family name
aRule->GetDesc(eCSSFontDesc_Family, val);
@ -1749,6 +1750,30 @@ InsertFontFaceRule(nsCSSFontFaceRule *aRule, gfxUserFontSet* aFontSet,
"@font-face style has unexpected unit");
}
// set up font features
aRule->GetDesc(eCSSFontDesc_FontFeatureSettings, val);
unit = val.GetUnit();
if (unit == eCSSUnit_Normal) {
// empty feature string
} else if (unit == eCSSUnit_String) {
val.GetStringValue(featureSettings);
} else {
NS_ASSERTION(unit == eCSSUnit_Null,
"@font-face font-feature-settings has unexpected unit");
}
// set up font language override
aRule->GetDesc(eCSSFontDesc_FontLanguageOverride, val);
unit = val.GetUnit();
if (unit == eCSSUnit_Normal) {
// empty feature string
} else if (unit == eCSSUnit_String) {
val.GetStringValue(languageOverride);
} else {
NS_ASSERTION(unit == eCSSUnit_Null,
"@font-face font-language-override has unexpected unit");
}
// set up src array
nsTArray<gfxFontFaceSrc> srcArray;
@ -1824,7 +1849,8 @@ InsertFontFaceRule(nsCSSFontFaceRule *aRule, gfxUserFontSet* aFontSet,
}
if (!fontfamily.IsEmpty() && srcArray.Length() > 0) {
aFontSet->AddFontFace(fontfamily, srcArray, weight, stretch, italicStyle);
aFontSet->AddFontFace(fontfamily, srcArray, weight, stretch, italicStyle,
featureSettings, languageOverride);
}
}

15
layout/style/nsCSSDeclaration.cpp
View File

@ -1030,6 +1030,10 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
*data->ValueStorageFor(eCSSProperty_font_stretch);
const nsCSSValue &sizeAdjust =
*data->ValueStorageFor(eCSSProperty_font_size_adjust);
const nsCSSValue &featureSettings =
*data->ValueStorageFor(eCSSProperty_font_feature_settings);
const nsCSSValue &languageOverride =
*data->ValueStorageFor(eCSSProperty_font_language_override);
if (systemFont &&
systemFont->GetUnit() != eCSSUnit_None &&
@ -1041,19 +1045,24 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
lh.GetUnit() != eCSSUnit_System_Font ||
family.GetUnit() != eCSSUnit_System_Font ||
stretch.GetUnit() != eCSSUnit_System_Font ||
sizeAdjust.GetUnit() != eCSSUnit_System_Font) {
sizeAdjust.GetUnit() != eCSSUnit_System_Font ||
featureSettings.GetUnit() != eCSSUnit_System_Font ||
languageOverride.GetUnit() != eCSSUnit_System_Font) {
// This can't be represented as a shorthand.
return NS_OK;
}
AppendCSSValueToString(eCSSProperty__x_system_font, *systemFont,
aValue);
} else {
// The font-stretch and font-size-adjust
// The font-stretch, font-size-adjust,
// -moz-font-feature-settings, and -moz-font-language-override
// properties are reset by this shorthand property to their
// initial values, but can't be represented in its syntax.
if (stretch.GetUnit() != eCSSUnit_Enumerated ||
stretch.GetIntValue() != NS_STYLE_FONT_STRETCH_NORMAL ||
sizeAdjust.GetUnit() != eCSSUnit_None) {
sizeAdjust.GetUnit() != eCSSUnit_None ||
featureSettings.GetUnit() != eCSSUnit_Normal ||
languageOverride.GetUnit() != eCSSUnit_Normal) {
return NS_OK;
}

14
layout/style/nsCSSParser.cpp
View File

@ -5963,6 +5963,10 @@ CSSParserImpl::ParseSingleValueProperty(nsCSSValue& aValue,
nsCSSProps::kFloatEdgeKTable);
case eCSSProperty_font_family:
return ParseFamily(aValue);
case eCSSProperty_font_feature_settings:
case eCSSProperty_font_language_override:
return ParseVariant(aValue, VARIANT_NORMAL | VARIANT_INHERIT |
VARIANT_STRING, nsnull);
case eCSSProperty_font_size:
return ParseNonNegativeVariant(aValue,
VARIANT_HKLP | VARIANT_SYSFONT |
@ -6241,6 +6245,10 @@ CSSParserImpl::ParseFontDescriptorValue(nsCSSFontDesc aDescID,
case eCSSFontDesc_UnicodeRange:
return ParseFontRanges(aValue);
case eCSSFontDesc_FontFeatureSettings:
case eCSSFontDesc_FontLanguageOverride:
return ParseVariant(aValue, VARIANT_NORMAL | VARIANT_STRING, nsnull);
case eCSSFontDesc_UNKNOWN:
case eCSSFontDesc_COUNT:
NS_NOTREACHED("bad nsCSSFontDesc code");
@ -7825,6 +7833,8 @@ CSSParserImpl::ParseFont()
AppendValue(eCSSProperty_line_height, family);
AppendValue(eCSSProperty_font_stretch, family);
AppendValue(eCSSProperty_font_size_adjust, family);
AppendValue(eCSSProperty_font_feature_settings, family);
AppendValue(eCSSProperty_font_language_override, family);
}
else {
AppendValue(eCSSProperty__x_system_font, family);
@ -7837,6 +7847,8 @@ CSSParserImpl::ParseFont()
AppendValue(eCSSProperty_line_height, systemFont);
AppendValue(eCSSProperty_font_stretch, systemFont);
AppendValue(eCSSProperty_font_size_adjust, systemFont);
AppendValue(eCSSProperty_font_feature_settings, systemFont);
AppendValue(eCSSProperty_font_language_override, systemFont);
}
return PR_TRUE;
}
@ -7898,6 +7910,8 @@ CSSParserImpl::ParseFont()
AppendValue(eCSSProperty_font_stretch,
nsCSSValue(NS_FONT_STRETCH_NORMAL, eCSSUnit_Enumerated));
AppendValue(eCSSProperty_font_size_adjust, nsCSSValue(eCSSUnit_None));
AppendValue(eCSSProperty_font_feature_settings, nsCSSValue(eCSSUnit_Normal));
AppendValue(eCSSProperty_font_language_override, nsCSSValue(eCSSUnit_Normal));
return PR_TRUE;
}
}

22
layout/style/nsCSSPropList.h
View File

@ -1430,6 +1430,28 @@ CSS_PROP_FONT(
nsnull,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_FONT(
-moz-font-feature-settings,
font_feature_settings,
MozFontFeatureSettings,
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE,
Font,
mFontFeatureSettings,
eCSSType_Value,
nsnull,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_FONT(
-moz-font-language-override,
font_language_override,
MozFontLanguageOverride,
CSS_PROPERTY_APPLIES_TO_FIRST_LETTER_AND_FIRST_LINE,
Font,
mFontLanguageOverride,
eCSSType_Value,
nsnull,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
CSS_PROP_FONT(
font-size,
font_size,

2
layout/style/nsCSSProperty.h
View File

@ -101,6 +101,8 @@ enum nsCSSFontDesc {
eCSSFontDesc_Stretch,
eCSSFontDesc_Src,
eCSSFontDesc_UnicodeRange,
eCSSFontDesc_FontFeatureSettings,
eCSSFontDesc_FontLanguageOverride,
eCSSFontDesc_COUNT
};

6
layout/style/nsCSSProps.cpp
View File

@ -86,7 +86,9 @@ static const char* const kCSSRawFontDescs[] = {
"font-weight",
"font-stretch",
"src",
"unicode-range"
"unicode-range",
"-moz-font-feature-settings",
"-moz-font-language-override"
};
struct PropertyAndCount {
@ -1859,6 +1861,8 @@ static const nsCSSProperty gFontSubpropTable[] = {
eCSSProperty_font_size_adjust, // XXX Added LDB.
eCSSProperty_font_stretch, // XXX Added LDB.
eCSSProperty__x_system_font,
eCSSProperty_font_feature_settings,
eCSSProperty_font_language_override,
eCSSProperty_UNKNOWN
};

4
layout/style/nsCSSRules.cpp
View File

@ -1576,7 +1576,9 @@ nsCSSFontFaceStyleDecl::Fields[] = {
&nsCSSFontFaceStyleDecl::mWeight,
&nsCSSFontFaceStyleDecl::mStretch,
&nsCSSFontFaceStyleDecl::mSrc,
&nsCSSFontFaceStyleDecl::mUnicodeRange
&nsCSSFontFaceStyleDecl::mUnicodeRange,
&nsCSSFontFaceStyleDecl::mFontFeatureSettings,
&nsCSSFontFaceStyleDecl::mFontLanguageOverride
};
DOMCI_DATA(CSSFontFaceStyleDecl, nsCSSFontFaceStyleDecl)

2
layout/style/nsCSSRules.h
View File

@ -234,6 +234,8 @@ protected:
nsCSSValue mStretch;
nsCSSValue mSrc;
nsCSSValue mUnicodeRange;
nsCSSValue mFontFeatureSettings;
nsCSSValue mFontLanguageOverride;
static nsCSSValue nsCSSFontFaceStyleDecl::* const Fields[];
inline nsCSSFontFaceRule* ContainingRule();

2
layout/style/nsCSSStruct.h
View File

@ -283,6 +283,8 @@ struct nsCSSFont : public nsCSSStruct {
nsCSSValue mSize;
nsCSSValue mSizeAdjust; // NEW
nsCSSValue mStretch; // NEW
nsCSSValue mFontFeatureSettings;
nsCSSValue mFontLanguageOverride;
#ifdef MOZ_MATHML
nsCSSValue mScriptLevel; // Integer values mean "relative", Number values mean "absolute"

36
layout/style/nsComputedDOMStyle.cpp
View File

@ -1318,6 +1318,40 @@ nsComputedDOMStyle::GetFontVariant(nsIDOMCSSValue** aValue)
return NS_OK;
}
nsresult
nsComputedDOMStyle::GetMozFontFeatureSettings(nsIDOMCSSValue** aValue)
{
nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
NS_ENSURE_TRUE(val, NS_ERROR_OUT_OF_MEMORY);
const nsStyleFont* font = GetStyleFont();
if (font->mFont.featureSettings.IsEmpty()) {
val->SetIdent(eCSSKeyword_normal);
} else {
nsString str;
nsStyleUtil::AppendEscapedCSSString(font->mFont.featureSettings, str);
val->SetString(str);
}
return CallQueryInterface(val, aValue);
}
nsresult
nsComputedDOMStyle::GetMozFontLanguageOverride(nsIDOMCSSValue** aValue)
{
nsROCSSPrimitiveValue* val = GetROCSSPrimitiveValue();
NS_ENSURE_TRUE(val, NS_ERROR_OUT_OF_MEMORY);
const nsStyleFont* font = GetStyleFont();
if (font->mFont.languageOverride.IsEmpty()) {
val->SetIdent(eCSSKeyword_normal);
} else {
nsString str;
nsStyleUtil::AppendEscapedCSSString(font->mFont.languageOverride, str);
val->SetString(str);
}
return CallQueryInterface(val, aValue);
}
nsresult
nsComputedDOMStyle::GetBackgroundList(PRUint8 nsStyleBackground::Layer::* aMember,
PRUint32 nsStyleBackground::* aCount,
@ -4764,6 +4798,8 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule_width, ColumnRuleWidth),
COMPUTED_STYLE_MAP_ENTRY(_moz_column_rule_style, ColumnRuleStyle),
COMPUTED_STYLE_MAP_ENTRY(float_edge, FloatEdge),
COMPUTED_STYLE_MAP_ENTRY(font_feature_settings, MozFontFeatureSettings),
COMPUTED_STYLE_MAP_ENTRY(font_language_override, MozFontLanguageOverride),
COMPUTED_STYLE_MAP_ENTRY(force_broken_image_icon, ForceBrokenImageIcon),
COMPUTED_STYLE_MAP_ENTRY(image_region, ImageRegion),
COMPUTED_STYLE_MAP_ENTRY_LAYOUT(_moz_outline_radius_bottomLeft, OutlineRadiusBottomLeft),

2
layout/style/nsComputedDOMStyle.h
View File

@ -183,6 +183,8 @@ private:
/* Font properties */
nsresult GetColor(nsIDOMCSSValue** aValue);
nsresult GetFontFamily(nsIDOMCSSValue** aValue);
nsresult GetMozFontFeatureSettings(nsIDOMCSSValue** aValue);
nsresult GetMozFontLanguageOverride(nsIDOMCSSValue** aValue);
nsresult GetFontSize(nsIDOMCSSValue** aValue);
nsresult GetFontSizeAdjust(nsIDOMCSSValue** aValue);
nsresult GetFontStretch(nsIDOMCSSValue** aValue);

26
layout/style/nsRuleNode.cpp
View File

@ -3275,6 +3275,32 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext,
}
#endif
// font-feature-settings
if (eCSSUnit_Inherit == aFontData.mFontFeatureSettings.GetUnit()) {
aCanStoreInRuleTree = PR_FALSE;
aFont->mFont.featureSettings = aParentFont->mFont.featureSettings;
} else if (eCSSUnit_Normal == aFontData.mFontFeatureSettings.GetUnit() ||
eCSSUnit_Initial == aFontData.mFontFeatureSettings.GetUnit()) {
aFont->mFont.featureSettings.Truncate();
} else if (eCSSUnit_System_Font == aFontData.mFontFeatureSettings.GetUnit()) {
aFont->mFont.featureSettings = systemFont.featureSettings;
} else if (eCSSUnit_String == aFontData.mFontFeatureSettings.GetUnit()) {
aFontData.mFontFeatureSettings.GetStringValue(aFont->mFont.featureSettings);
}
// font-language-override
if (eCSSUnit_Inherit == aFontData.mFontLanguageOverride.GetUnit()) {
aCanStoreInRuleTree = PR_FALSE;
aFont->mFont.languageOverride = aParentFont->mFont.languageOverride;
} else if (eCSSUnit_Normal == aFontData.mFontLanguageOverride.GetUnit() ||
eCSSUnit_Initial == aFontData.mFontLanguageOverride.GetUnit()) {
aFont->mFont.languageOverride.Truncate();
} else if (eCSSUnit_System_Font == aFontData.mFontLanguageOverride.GetUnit()) {
aFont->mFont.languageOverride = systemFont.languageOverride;
} else if (eCSSUnit_String == aFontData.mFontLanguageOverride.GetUnit()) {
aFontData.mFontLanguageOverride.GetStringValue(aFont->mFont.languageOverride);
}
// font-size: enum, length, percent, inherit
nscoord scriptLevelAdjustedParentSize = aParentFont->mSize;
#ifdef MOZ_MATHML

4
layout/style/nsStyleStruct.cpp
View File

@ -210,7 +210,9 @@ nsChangeHint nsStyleFont::CalcFontDifference(const nsFont& aFont1, const nsFont&
(aFont1.familyNameQuirks == aFont2.familyNameQuirks) &&
(aFont1.weight == aFont2.weight) &&
(aFont1.stretch == aFont2.stretch) &&
(aFont1.name == aFont2.name)) {
(aFont1.name == aFont2.name) &&
(aFont1.featureSettings == aFont2.featureSettings) &&
(aFont1.languageOverride == aFont2.languageOverride)) {
if ((aFont1.decorations == aFont2.decorations)) {
return NS_STYLE_HINT_NONE;
}

18
layout/style/test/property_database.js
View File

@ -1471,7 +1471,7 @@ var gCSSProperties = {
domProp: "font",
inherited: true,
type: CSS_TYPE_TRUE_SHORTHAND,
subproperties: [ "font-style", "font-variant", "font-weight", "font-size", "line-height", "font-family", "font-stretch", "font-size-adjust" ],
subproperties: [ "font-style", "font-variant", "font-weight", "font-size", "line-height", "font-family", "font-stretch", "font-size-adjust", "-moz-font-feature-settings", "-moz-font-language-override" ],
/* XXX could be sans-serif */
initial_values: [ "medium serif" ],
other_values: [ "large serif", "9px fantasy", "bold italic small-caps 24px/1.4 Times New Roman, serif", "caption", "icon", "menu", "message-box", "small-caption", "status-bar" ],
@ -1485,6 +1485,22 @@ var gCSSProperties = {
other_values: [ "sans-serif", "Times New Roman, serif", "'Times New Roman', serif", "cursive", "fantasy", "\"Times New Roman", "Times, \"Times New Roman" ],
invalid_values: [ "\"Times New\" Roman" ]
},
"-moz-font-feature-settings": {
domProp: "MozFontFeatureSettings",
inherited: true,
type: CSS_TYPE_LONGHAND,
initial_values: [ "normal" ],
other_values: [ "'liga=1'", "\"liga=1\"", "'foo,bar=\"hello\"'" ],
invalid_values: [ "liga=1", "foo,bar=\"hello\"" ]
},
"-moz-font-language-override": {
domProp: "MozFontLanguageOverride",
inherited: true,
type: CSS_TYPE_LONGHAND,
initial_values: [ "normal" ],
other_values: [ "'TRK'", "\"TRK\"", "'N\\'Ko'" ],
invalid_values: [ "TRK" ]
},
"font-size": {
domProp: "fontSize",
inherited: true,

4
layout/style/test/test_bug377947.html
View File

@ -58,7 +58,9 @@ var all_but_one = {
"font-weight": "bold",
"font-size": "small",
"font-size-adjust": "none", // has to be default value
"font-stretch": "normal" // has to be default value
"font-stretch": "normal", // has to be default value
"-moz-font-feature-settings": "normal", // has to be default value
"-moz-font-language-override": "normal" // has to be default value
};
for (var prop in all_but_one) {
s.setProperty(prop, all_but_one[prop], "");

2
layout/style/test/test_system_font_serialization.html
View File

@ -48,7 +48,7 @@ is(e.style.cssText, "font: menu; font-weight: -moz-use-system-font ! important;"
is(e.style.font, "", "font getter returns nothing");
e.setAttribute("style", "font: inherit; font-family: Helvetica;");
is(e.style.cssText, "font-style: inherit; font-variant: inherit; font-weight: inherit; font-size: inherit; line-height: inherit; font-size-adjust: inherit; font-stretch: inherit; font-family: Helvetica;", "don't serialize system font for font:inherit");
is(e.style.cssText, "font-style: inherit; font-variant: inherit; font-weight: inherit; font-size: inherit; line-height: inherit; font-size-adjust: inherit; font-stretch: inherit; -moz-font-feature-settings: inherit; -moz-font-language-override: inherit; font-family: Helvetica;", "don't serialize system font for font:inherit");
is(e.style.font, "", "font getter returns nothing");
</script>

4
layout/svg/base/src/nsSVGGlyphFrame.cpp
View File

@ -1501,7 +1501,9 @@ nsSVGGlyphFrame::EnsureTextRun(float *aDrawScale, float *aMetricsScale,
mStyleContext->GetStyleVisibility()->mLanguage,
font.sizeAdjust, font.systemFont,
font.familyNameQuirks,
printerFont);
printerFont,
font.featureSettings,
font.languageOverride);
nsRefPtr<gfxFontGroup> fontGroup =
gfxPlatform::GetPlatform()->CreateFontGroup(font.name, &fontStyle, presContext->GetUserFontSet());