Index: trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html |
=================================================================== |
--- trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html (revision 169272) |
+++ trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html (working copy) |
@@ -36,50 +36,50 @@ |
style.fontSize = "20px"; |
// We need at least the font-family to build the shorthand. |
shouldBe("style.font", "''"); |
-shouldBe("computedStyle.font", "'normal normal normal normal 20px/normal foobar'"); |
+shouldBe("computedStyle.font", "'normal normal normal 20px/normal foobar'"); |
shouldBe("computedStyle.fontSize", "'20px'"); |
shouldBe("checkFontStyleValue()", "true"); |
style.fontSize = "20px"; |
style.fontFamily = "sans-serif"; |
shouldBe("style.font", "'20px sans-serif'"); |
-shouldBe("computedStyle.font", "'normal normal normal normal 20px/normal sans-serif'"); |
+shouldBe("computedStyle.font", "'normal normal normal 20px/normal sans-serif'"); |
shouldBe("computedStyle.fontFamily", "'sans-serif'"); |
shouldBe("checkFontStyleValue()", "true"); |
style.fontStyle = "italic"; |
shouldBe("style.font", "'italic 20px sans-serif'"); |
-shouldBe("computedStyle.font", "'italic normal normal normal 20px/normal sans-serif'"); |
+shouldBe("computedStyle.font", "'italic normal normal 20px/normal sans-serif'"); |
shouldBe("computedStyle.fontStyle", "'italic'"); |
shouldBe("checkFontStyleValue()", "true"); |
style.fontVariant = "small-caps"; |
shouldBe("style.font", "'italic small-caps 20px sans-serif'"); |
-shouldBe("computedStyle.font", "'italic small-caps normal normal 20px/normal sans-serif'"); |
+shouldBe("computedStyle.font", "'italic small-caps normal 20px/normal sans-serif'"); |
shouldBe("computedStyle.fontVariant", "'small-caps'"); |
shouldBe("checkFontStyleValue()", "true"); |
style.fontWeight = "bold"; |
shouldBe("style.font", "'italic small-caps bold 20px sans-serif'"); |
-shouldBe("computedStyle.font", "'italic small-caps bold normal 20px/normal sans-serif'"); |
+shouldBe("computedStyle.font", "'italic small-caps bold 20px/normal sans-serif'"); |
shouldBe("computedStyle.fontWeight", "'bold'"); |
shouldBe("checkFontStyleValue()", "true"); |
style.lineHeight = "40px"; |
shouldBe("style.font", "'italic small-caps bold 20px/40px sans-serif'"); |
-shouldBe("computedStyle.font", "'italic small-caps bold normal 20px/40px sans-serif'"); |
+shouldBe("computedStyle.font", "'italic small-caps bold 20px/40px sans-serif'"); |
shouldBe("computedStyle.lineHeight", "'40px'"); |
shouldBe("checkFontStyleValue()", "true"); |
style.font = ""; |
shouldBe("style.font", "''"); |
-shouldBe("computedStyle.font", "'normal normal normal normal 16px/normal foobar'"); |
+shouldBe("computedStyle.font", "'normal normal normal 16px/normal foobar'"); |
shouldBe("checkFontStyleValue()", "true"); |
style.fontWeight = "bold"; |
// It is normal to return null as the font-size is mandatory to build the shorthand. |
shouldBe("style.font", "''"); |
-shouldBe("computedStyle.font", "'normal normal bold normal 16px/normal foobar'"); |
+shouldBe("computedStyle.font", "'normal normal bold 16px/normal foobar'"); |
shouldBe("computedStyle.fontWeight", "'bold'"); |
shouldBe("checkFontStyleValue()", "true"); |
@@ -87,7 +87,7 @@ |
style.fontFamily = "sans-serif"; |
style.fontWeight = "bold"; |
shouldBe("style.font", "'bold 40px sans-serif'"); |
-shouldBe("computedStyle.font", "'normal normal bold normal 40px/normal sans-serif'"); |
+shouldBe("computedStyle.font", "'normal normal bold 40px/normal sans-serif'"); |
shouldBe("computedStyle.fontSize", "'40px'"); |
shouldBe("computedStyle.fontFamily", "'sans-serif'"); |
shouldBe("checkFontStyleValue()", "true"); |
Property changes on: trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html |
___________________________________________________________________ |
Deleted: svn:mime-type |
- text/html |
Deleted: svn:eol-style |
- LF |