| Index: LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-decoration-line.js
|
| diff --git a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-decoration-line.js b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-decoration-line.js
|
| index 8f0d4ba7b4df3c0f197a0da49a500cea7a59628b..94d69fe540ef81daa1da694bfe2c3bc24d06af49 100644
|
| --- a/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-decoration-line.js
|
| +++ b/LayoutTests/fast/css3-text/css3-text-decoration/getComputedStyle/script-tests/getComputedStyle-text-decoration-line.js
|
| @@ -16,7 +16,7 @@ function testComputedStyle(propertyJS, propertyCSS, type, value)
|
| shouldBe("computedStyle.getPropertyCSSValue('" + propertyCSS + "').cssText", "'" + value + "'");
|
| }
|
|
|
| -description("Test to make sure -webkit-text-decoration-line property returns values properly.")
|
| +description("Test to make sure text-decoration-line property returns values properly.")
|
|
|
| var testContainer = document.createElement("div");
|
| testContainer.contentEditable = true;
|
| @@ -25,69 +25,69 @@ document.body.appendChild(testContainer);
|
| testContainer.innerHTML = '<div id="test">hello world</div>';
|
| debug("Initial value:");
|
| e = document.getElementById('test');
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", null, '');
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| +testElementStyle("textDecorationLine", "text-decoration-line", null, '');
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| debug('');
|
|
|
| debug("Initial value (explicit):");
|
| -e.style.webkitTextDecorationLine = 'initial';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValue]", "initial");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| +e.style.textDecorationLine = 'initial';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValue]", "initial");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| debug('');
|
|
|
| debug("Value 'none':");
|
| -e.style.webkitTextDecorationLine = 'none';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| +e.style.textDecorationLine = 'none';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| debug('');
|
|
|
| debug("Value 'underline':");
|
| -e.style.webkitTextDecorationLine = 'underline';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline");
|
| +e.style.textDecorationLine = 'underline';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline");
|
| debug('');
|
|
|
| debug("Value 'overline':");
|
| -e.style.webkitTextDecorationLine = 'overline';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "overline");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "overline");
|
| +e.style.textDecorationLine = 'overline';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "overline");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "overline");
|
| debug('');
|
|
|
| debug("Value 'line-through':");
|
| -e.style.webkitTextDecorationLine = 'line-through';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "line-through");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "line-through");
|
| +e.style.textDecorationLine = 'line-through';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "line-through");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "line-through");
|
| debug('');
|
|
|
| debug("Value 'underline overline line-through':");
|
| -e.style.webkitTextDecorationLine = 'underline overline line-through';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| +e.style.textDecorationLine = 'underline overline line-through';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| debug('');
|
|
|
| debug("Value 'blink' (invalid, last valid value is used):");
|
| -e.style.webkitTextDecorationLine = 'blink';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| +e.style.textDecorationLine = 'blink';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline overline line-through");
|
| debug('');
|
|
|
| debug("Value '':");
|
| -e.style.webkitTextDecorationLine = '';
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", null, '');
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| +e.style.textDecorationLine = '';
|
| +testElementStyle("textDecorationLine", "text-decoration-line", null, '');
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSPrimitiveValue]", "none");
|
| debug('');
|
|
|
| -testContainer.innerHTML = '<div id="test-parent" style="-webkit-text-decoration-line: underline;">hello <span id="test-ancestor" style="-webkit-text-decoration-line: inherit;">world</span></div>';
|
| +testContainer.innerHTML = '<div id="test-parent" style="text-decoration-line: underline;">hello <span id="test-ancestor" style="text-decoration-line: inherit;">world</span></div>';
|
| debug("Parent gets 'underline' value:");
|
| e = document.getElementById('test-parent');
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline");
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline");
|
| debug('');
|
|
|
| debug("Ancestor should explicitly inherit value from parent when 'inherit' value is used:");
|
| e = document.getElementById('test-ancestor');
|
| -testElementStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValue]", "inherit");
|
| -testComputedStyle("webkitTextDecorationLine", "-webkit-text-decoration-line", "[object CSSValueList]", "underline");
|
| +testElementStyle("textDecorationLine", "text-decoration-line", "[object CSSValue]", "inherit");
|
| +testComputedStyle("textDecorationLine", "text-decoration-line", "[object CSSValueList]", "underline");
|
| debug('');
|
|
|
| document.body.removeChild(testContainer);
|
|
|