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

Fix another case where we incorrectly serialize an -x-system-font property. (Bug 478156) r+sr=bzbarsky

Browse Source
This commit is contained in:
L. David Baron 2009-02-19 13:55:48 -08:00
parent edb9eef663
commit f83c362f04
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/style/nsCSSDeclaration.cpp
View File

@ -1046,8 +1046,8 @@ nsCSSDeclaration::ToString(nsAString& aString) const
NS_ASSERTION(shorthand != eCSSProperty_font ||
*(shorthands + 1) == eCSSProperty_UNKNOWN,
"font should always be the only containing shorthand");
if (shorthand == eCSSProperty_font && haveSystemFont) {
if (!didSystemFont) {
if (shorthand == eCSSProperty_font) {
if (haveSystemFont && !didSystemFont) {
// Output the shorthand font declaration that we will
// partially override later. But don't add it to
// |shorthandsUsed|, since we will have to override it.
@ -1059,15 +1059,17 @@ nsCSSDeclaration::ToString(nsAString& aString) const
}
// That we output the system font is enough for this property if:
// (1) it's the hidden system font subproperty, or
// (1) it's the hidden system font subproperty (which either
// means we output it or we don't have it), or
// (2) its value is the hidden system font value and it matches
// the hidden system font subproperty in importance.
// the hidden system font subproperty in importance, and
// we output the system font subproperty.
NS_ASSERTION(nsCSSProps::kTypeTable[property] == eCSSType_Value,
"not a value typed subproperty");
const nsCSSValue *val =
systemFontData->ValueStorageFor(property);
if (property == eCSSProperty__x_system_font ||
(val && val->GetUnit() == eCSSUnit_System_Font)) {
(haveSystemFont && val && val->GetUnit() == eCSSUnit_System_Font)) {
doneProperty = PR_TRUE;
}
}

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

@ -47,6 +47,10 @@ e.setAttribute("style", "font: menu; font-weight: -moz-use-system-font ! importa
is(e.style.cssText, "font: menu; font-weight: -moz-use-system-font ! important;", "serialize system font and subproperty that is 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.font, "", "font getter returns nothing");
</script>
</pre>
</body>