Mark tests passing that were fixed by bug 389464.

This commit is contained in:
dbaron@dbaron.org 2007-07-25 17:01:32 -07:00
Родитель dd22674e2f
Коммит c6705e7afa
2 изменённых файлов: 4 добавлений и 13 удалений

Просмотреть файл

@ -97,13 +97,11 @@ function test_property(property)
gParentRuleTop.style.setProperty(property, info.other_values[0], ""); gParentRuleTop.style.setProperty(property, info.other_values[0], "");
var inherit_other_computed_n = get_computed_value_node(gNChild, property); var inherit_other_computed_n = get_computed_value_node(gNChild, property);
var inherit_other_computed_f = get_computed_value_node(gFChild, property); var inherit_other_computed_f = get_computed_value_node(gFChild, property);
var xfail_inherit_other = xfail_inherit(property, false) || (xfail_inherit(property, false) ? todo_is : is)(
property == "font-family"; /* bug 385699 */
(xfail_inherit_other ? todo_is : is)(
inherit_other_computed_n, other_computed_n, inherit_other_computed_n, other_computed_n,
"inherit should cause inheritance of other value for '" + "inherit should cause inheritance of other value for '" +
property + "'"); property + "'");
(xfail_inherit_other ? todo_is : is)( (xfail_inherit(property, false) ? todo_is : is)(
inherit_other_computed_f, other_computed_f, inherit_other_computed_f, other_computed_f,
"inherit should cause inheritance of other value for '" + "inherit should cause inheritance of other value for '" +
property + "'"); property + "'");

Просмотреть файл

@ -73,15 +73,8 @@ for (var prop in gCSSProperties) {
var parent = getComputedStyle(gElementParent, "").getPropertyValue(prop); var parent = getComputedStyle(gElementParent, "").getPropertyValue(prop);
var child = getComputedStyle(gElementChild, "").getPropertyValue(prop); var child = getComputedStyle(gElementChild, "").getPropertyValue(prop);
// We get a failure here for font-family because is(child, parent,
// nsRuleNode::ComputeFontData clobbers the NS_STYLE_FONT_FACE_MASK "property '" + prop + "' was copy-constructed correctly (inheritance)");
// part of font->mFlags even when the font name was copied from
// aStartStruct. This causes nsComputedDOMStyle::GetFontFamily to
// chop a bunch of characters off of the end of font->mFont.name.
var func = (prop == "font-family" ? todo_is : is);
func(child, parent,
"property '" + prop + "' was copy-constructed correctly (inheritance)");
gRule2.style.setProperty(prop, info.other_values[0], ""); gRule2.style.setProperty(prop, info.other_values[0], "");
} }