| Index: LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
|
| diff --git a/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js b/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
|
| index b092a74db82bd7e62765a3c2eb44a12e5d488232..0d8547c86f5441c9ff557e6d9aab356c55b3a3a5 100644
|
| --- a/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
|
| +++ b/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js
|
| @@ -9,15 +9,6 @@ function computedFont(fontString) {
|
| return window.getComputedStyle(testDiv).getPropertyValue('font');
|
| }
|
|
|
| -function computedFontCSSValue(fontString) {
|
| - testDiv.style.font = 'bold 600px serif';
|
| - testDiv.style.font = fontString;
|
| - var cssValue = window.getComputedStyle(testDiv).getPropertyCSSValue('font');
|
| - if (cssValue === null)
|
| - return null;
|
| - return cssValue.cssText;
|
| -}
|
| -
|
| shouldBe("computedFont('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| shouldBe("computedFont('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal normal 10px/normal sans-serif'");
|
| @@ -46,32 +37,3 @@ shouldBe("computedFont('10px/100% sans-serif')", "'normal normal normal normal 1
|
| shouldBe("computedFont('10px/100px sans-serif')", "'normal normal normal normal 10px/100px sans-serif'");
|
| shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| -
|
| -shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px SANS-SERIF')", "'normal normal normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal normal 12px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal normal 12px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px sans-serif, sans-serif')", "'normal normal normal normal 10px/normal sans-serif, sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px sans-serif, serif')", "'normal normal normal normal 10px/normal sans-serif, serif'");
|
| -shouldBe("computedFontCSSValue('12px ahem')", "'normal normal normal normal 12px/normal ahem'");
|
| -shouldBe("computedFontCSSValue('12px unlikely-font-name')", "'normal normal normal normal 12px/normal unlikely-font-name'");
|
| -shouldBe("computedFontCSSValue('100 10px sans-serif')", "'normal normal 100 normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('200 10px sans-serif')", "'normal normal 200 normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('300 10px sans-serif')", "'normal normal 300 normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('400 10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('normal 10px sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('500 10px sans-serif')", "'normal normal 500 normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('600 10px sans-serif')", "'normal normal 600 normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('700 10px sans-serif')", "'normal normal bold normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('bold 10px sans-serif')", "'normal normal bold normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('800 10px sans-serif')", "'normal normal 800 normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('900 10px sans-serif')", "'normal normal 900 normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('italic 10px sans-serif')", "'italic normal normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('small-caps 10px sans-serif')", "'normal small-caps normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('italic small-caps 10px sans-serif')", "'italic small-caps normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('italic small-caps bold 10px sans-serif')", "'italic small-caps bold normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px/100% sans-serif')", "'normal normal normal normal 10px/10px sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px/100px sans-serif')", "'normal normal normal normal 10px/100px sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
| -shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal normal 10px/normal sans-serif'");
|
|
|